Merge "Revert "Reparent bounds layer if surface was replaced."" into...

Merge "Revert "Reparent bounds layer if surface was replaced."" into rvc-d1-dev am: 15e6f37a am: 464e5152

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

Change-Id: Ibdaac0e08c3b0a779c4611c40531284051eb473c