[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: 793865d7 am: 3c3c0312 am: d9e614ec -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: I6c4f361246769118ef6d468641f73155dd635a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>