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

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

Change-Id: If0e86b3c72c1e6db49f95bb64c8a2382dc74d7f1