Merge "Remove then add during replace to reset vis" into rvc-dev am: 155007ab am: 5306229d

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

Change-Id: I8cca462f5d41f090167351f4f848fd0b239da215