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

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

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

Change-Id: I085b0e2a704a3b7ec8e069f5fe486c9cf677bf27