Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev...
Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev am: 6e66280d" into pi-dev-plus-aosp
am: 35bca7f5
Change-Id: I349260cae5d0d97f2f0962f62510703c5a94995c