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

Change-Id: Id7d778048e411acc447b4adf43d977e8eb98a8af
tree: b2248b443e202fedbda7457cfd41fc1deb8c6e82
  1. core/
  2. services/
  3. tests/