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

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

Change-Id: I92379a9c2dd49804db6cd67e358752e2c01ac663