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

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

Change-Id: I670a6eb5125a206484a21e2028dac3da66d5ea57