Merge "Add tests for PermissionMonitor" am: 4e39721f18
am: e11632e768

Change-Id: I9be22991bd590a7aee4d0a4b2908e0023870d0b6
tree: 6f065b2444e37b5788ac035b2b4b00e0d72a1059
  1. core/
  2. services/
  3. tests/