Merge "Fix revokePermissionsNoLongerImplicitLocked() for shared UIDs." into sc-dev