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

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

Change-Id: I39d4edd4511d1677af0415d57123f88e5705c3dc