Merge "Merge "Remove then add during replace to reset vis" into rvc-dev am: 155007ab1f am: 5306229d9b" into rvc-d1-dev-plus-aosp am: 057a117440 am: 8d04e410f3

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

Change-Id: Ic82f250cb08457ae492171e9af60fce53a3d64b1