[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: 06b7570f am: 4c11581a -s ours am: 429af111 -s ours

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

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



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