Merge "Merge "Reparent bounds layer if surface was replaced." into rvc-dev am:...

Merge "Merge "Reparent bounds layer if surface was replaced." into rvc-dev am: ab3d80c9 am: fa48a156 am: f3f9ce31" into rvc-qpr-dev-plus-aosp am: da4119d3

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

Change-Id: If8b43f2ca267bca2286d46378b574bba953d21b6