Merge "Correct visibility to use __pkg__" am: b0d3d461f8 am: 0716e5fe62

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

Change-Id: I1f8fd9a25fe07b8a5cc278c421f6370e7946a50b