Merge "Use spy in PermissionMonitorTest." am: e666ae6ee5
am: 57b23ac131

Change-Id: I9eac5d82c0b5e3eb5593407aa2eb82cb8c71dc2e
tree: d0914094758758e9f2680df082a183219a7289a5
  1. core/
  2. services/
  3. tests/