Merge "Merge "Reparent task back to the surface control during change transitions" into udc-dev am: 545899f8" into udc-dev-plus-aosp am: 6fbb5b23 am: 7126b7b7

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



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