Merge "Move Task Close to WindowContainerTransaction" into tm-qpr-dev am: ef023c1411

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

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