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: Iac961c8bd08ea30f23e42ab7001e33cb82b8cf62