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

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

Change-Id: I3730e00f4503b7e5cd5a9ba38d1b034e42b5f0d4