Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: ae3ad24751

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

Change-Id: Ide0906020f10c23011c8d71fd0bbdeb7bf2b301b