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

Merge "Merge "Add visibility special casing for sdk sandbox" into tm-dev am: f598205c am: ee2f587b" into tm-d1-dev-plus-aosp am: 232c4041

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



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