[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: 357fd04b12 -s ours
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 2e1da35b3b is in history

Change-Id: I5b65a90ca11912a369680f58d82d22e381f110ca