Merge "Add tests for PermissionMonitor" am: 5758c87a8f
am: a75a64640c

Change-Id: I9be22991bd590a7aee4d0a4b2908e0023870d0b6