[automerger skipped] Merge "Fix security problem on...

[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b0698 am: 81db8d8a am: 5b6d8d77 -s ours am: d0715a9f -s ours am: c64d1c46 -s ours am: b43b52a2 -s ours am: 6d70f9f3 -s ours
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 2e1da35b is in history

Change-Id: I4214af1569adfad7a376fe95fffc6127dcc3a223