Merge "Revert "Reparent bounds layer if surface was replaced."" into rvc-d1-dev am: 15e6f37a16 am: 464e51527f am: 7c813fc4fb

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

Change-Id: I95277bd456ed4acf07d1eb74ad7ac682e568bf97