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

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



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