Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 81db8d8a83

Change-Id: I5660cafce05a0e3c6edff03bd645d8df329c5d50