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: 2302ed04 am: ea367637" into rvc-qpr-dev-plus-aosp am: 425cf508

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

Change-Id: Id03d6af50a99e2a418a8c09554947414d38d71d0