Merge "Properly fix revokePermissionsNoLongerImplicitLocked() for shared UIDs." am: adf939b3d3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005250

Change-Id: I28921d53213efb23bed45f5e4fec4a4fbffd871f