Merge "Use per-user Shell UID for adoptShellPermissionIdentity()." into rvc-qpr-dev am: 91596432 am: b39b8957

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8b141548658161e8fa70b30fb58d8a6ea0a7a62