[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours am: d643f69d68 -s ours am: f13799cb24 -s ours am: c47be40b76 -s ours
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 6c93075645 is in history

Change-Id: I1e7d1dfcc789c0a5f801c880c2bbbe8bc6e781d3
tree: 44ab1c2de068011980bbdc8e851c687c95f38428
  1. core/
  2. services/
  3. tests/