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: I658caccf155447f65731b4433c399a8894d9ad3b