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

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



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