[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 skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 d0205a34 is in history

Change-Id: Id7d778048e411acc447b4adf43d977e8eb98a8af