[automerger skipped] Merge "Handle the visibility of sdk sandbox uids" into...

[automerger skipped] Merge "Handle the visibility of sdk sandbox uids" into tm-dev am: 6c0ca16d am: 0a7720fc -s ours

am skip reason: Merged-In Ic2583610f55c36169f9abb35b58a0ab60884a312 with SHA-1 f464ff68 is already in history

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



Change-Id: I6f4b872de01af09531859633688c7ceee7e6b5f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>