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

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



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