Merge "Add tests for PermissionMonitor"
am: a84cdf4fc6

Change-Id: I2079c4ce13aae962c1d907009edc107e861bb3b5