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

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

Change-Id: Ieb1c52ed49c126d112784cb7228f1295fd7a8c29