Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc am: 5942721506 am: 29bed11140

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

Change-Id: I823c257bfdb8ef2656f49ddfa697bedbd3abc8c9