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: I0b7e1d7a023b9bef1d4b6c81c88d89a4a8cd14fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>