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

Merge "Fixes component-based visibility recompute" into rvc-dev am: e505016e am: 7719b564 am: 629eb671

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

Change-Id: I1a3a0f677873af64c2ebb1508899a6e43513cfdd