Merge "Merge "Update visibility when attached" into rvc-dev am: 1262dc84 am: 7c097302" into rvc-d1-dev-plus-aosp am: 7ed462db

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

Change-Id: I5530f84895301cdd32c6454fe277ad16e1d8d90c