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: 0415b859 am: b25bc640

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

Change-Id: I43842bbee7faef8061cfa664586e9430c7c11adf