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

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

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



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