Merge "Repopulate cache with sibling visibility on remove" into rvc-dev am: 606981a8

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

Change-Id: I32107e0d3867c97ca5659189e171680121fd8602