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

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

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



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