[automerger skipped] Merge "Properly fix revokePermissionsNoLongerImplicitLocked() for shared UIDs." am: adf939b3d3 am: 45c3d99280 am: 48c2552dfe -s ours

am skip reason: Merged-In I8315dc27b703d819e8970134d5cf17b0edbc22dc with SHA-1 dde7ea23aa is already in history

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

Change-Id: Idf7859470724e530f23d655240d6082ffdca4f6b