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

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

Change-Id: Ic9cfadfa3709c8be3b44fe58423ecc4c654d17ff