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

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

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