Merge changes I75290c1c,I8d1c8b64

* changes:
  Finish cleaning up locking inside PermissionManagerService.
  Remove locking inside PermissionRegistry.