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

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

Change-Id: I620278fe572b48c3e1121a6c84a6d876c74c0242