Merge "Handle the visibility of sdk sandbox uids" into tm-dev am: 6c0ca16d am: 793865d7

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



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