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

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

Change-Id: I271edcea4601cfee5bc507b250d6e7519acebf77