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

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

Change-Id: Ie272ccf63171a21107151abf8fd162c7f40262f2