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

Change-Id: I04970c02f44adbff3c713c81a18840b3d4c2c7d8