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: 14d7a109

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

Change-Id: Ib0d0a7cf6e8abf2f4e36a784d39c37d8dbbb8cb3