[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 ff042fd0d9 is in history

Change-Id: Id83288231d705e604e5094d40d211c0c940c4dd4
tree: e109314b90cdc9eb906d0903b1985abba8f5f113
  1. core/
  2. services/
  3. tests/