Merge "Handle the visibility of sdk sandbox uids" into tm-dev am: 6c0ca16d0b am: 06b7570ffe

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

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