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

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

Change-Id: If9f93934fab92e9d81f825551a8d593aee518d0f