[automerger skipped] Merge "Properly fix...

[automerger skipped] Merge "Properly fix revokePermissionsNoLongerImplicitLocked() for shared UIDs." am: adf939b3 am: 45c3d992 am: 48c2552d -s ours am: bdf54fe3 -s ours am: a9619dd9 -s ours

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

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

Change-Id: Ia59975225b6cbbdb690f674b88eabb92425f84d7