Merge "Merge "Remove then add during replace to reset vis" into rvc-dev am:...

Merge "Merge "Remove then add during replace to reset vis" into rvc-dev am: 155007ab am: 5306229d" into rvc-d1-dev-plus-aosp am: 057a1174 am: 8d04e410

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

Change-Id: Ic82f250cb08457ae492171e9af60fce53a3d64b1