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

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