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

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

Change-Id: I87a9bcb4b052e4d961f1538bb7f892c1fd930350