Merge "Add tests for PermissionMonitor" am: a84cdf4fc6
am: b9ee567881

Change-Id: I9be22991bd590a7aee4d0a4b2908e0023870d0b6