Merge "Reparent task back to the surface control during change transitions"...

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

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



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