Merge "Merge "Ensure detached children aren't parented to new SurfaceControl"...

Merge "Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c4 am: ae3ad247" into rvc-d1-dev-plus-aosp am: a5908b9d am: 6c845219

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

Change-Id: I2247cd4464216befd07956a89c73a8a35b039661