Finish cleaning up locking inside PermissionManagerService.

Bug: 158736025
Test: LockFinder
Test: Errorprone @GuardedBy
Test: presubmit
Change-Id: I75290c1c7d634fa448ee254c2b10494ea2ad8cc6
2 files changed