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

Change-Id: Ifcb29bfded1b1675231c397ed886506a70267279