Merge "Properly fix revokePermissionsNoLongerImplicitLocked() for shared UIDs."