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

Change-Id: I5b65a90ca11912a369680f58d82d22e381f110ca
tree: 6b0fe7b9697961d0550fbaed88ba097da4865876
  1. core/
  2. services/
  3. tests/