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

Merge "Reparent bounds layer if surface was replaced." into rvc-dev am: ab3d80c9 am: fa48a156 am: 75a12e74 am: 04002dfd

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

Change-Id: Ic583c118d6b9e7b8aa8498482b39f3f2d3dfbb61