Merge "Fixes component-based visibility recompute" into rvc-dev am: e505016e...

Merge "Fixes component-based visibility recompute" into rvc-dev am: e505016e am: 224d3e04 am: bdaac721

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

Change-Id: I0cc6f5f965233b6556b9670324f62149365e4cfe