Merge "Fix PermissionMonitorTest that has been failing." into pi-dev
am: 6e66280d35

Change-Id: Ifb04fdda2b54b0bde8b6eeead3e0240d5cc1ff79
tree: fdeec433ba0f02f79c7bbea316901dd83313c6c0
  1. core/
  2. services/
  3. tests/