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

Change-Id: I641d8967ec8af4b58696bf2c044f5a87a6836937
tree: b2248b443e202fedbda7457cfd41fc1deb8c6e82
  1. core/
  2. services/
  3. tests/