[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae am: b5af3bfb78 -s ours
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 4c36a00d58 is in history

Change-Id: Ifa87cac191ad07937dc70770ff74a9d025131a40
tree: d5b8d7b6d84aaa0c39efbe735faed05362fcdd88
  1. core/
  2. services/
  3. tests/