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

Change-Id: I4c255820617a86afdfa239febdd46fff7d082381