Merge "Correct visibility to use __pkg__" am: b0d3d461f8

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

Change-Id: I36bce826e8df03d763260cfd2257307c5ddd5b7b