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: ee2f587b am: 0c8bb60c

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



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