Merge "Merge "Reparent bounds layer if surface was replaced." into rvc-dev am: ab3d80c9 am: 2b669798" into rvc-d1-dev-plus-aosp am: 271ebfe8

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

Change-Id: I136f8579e09a8643b40cee4818980cfe926f103a