Merge "Add visibility special casing for sdk sandbox" into tm-dev am: f598205c

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



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