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

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

Change-Id: I82a55ce708e9ab0a94562c16e95d34732d4cc750