Merge "Reparent task back to the surface control during change transitions" into udc-dev am: 545899f8 am: a1c3a0a2 am: d8154d16

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



Change-Id: I9c69270de85b3653704612e5103e64dbb465fc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>