Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc

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

Change-Id: Iba29a96f2058373cc5d0454551ec2bd64b6e7b1b