Merge changes from topics "presubmit-am-4fce8d22f6ba4533875ba6f9fcf0183b", "presubmit-am-748689f93ea9431ca216195bbc7d9588" into tm-dev

* changes:
  Fix potential deadlock in restorePermissionState().
  Properly fix revokePermissionsNoLongerImplicitLocked() for shared UIDs.