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

Change-Id: I04970c02f44adbff3c713c81a18840b3d4c2c7d8
tree: 44ab1c2de068011980bbdc8e851c687c95f38428
  1. core/
  2. services/
  3. tests/