Merge changes from topic "bug_167962976_visibility" am: 39c6068c am:...

Merge changes from topic "bug_167962976_visibility" am: 39c6068c am: 59427215 am: 29bed111 am: a678e6b1

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

Change-Id: I476629002e075d01c83f77be8343157dbd66ce9b