Merge "Merge "Handle close transitions for freeform tasks." into udc-qpr-dev...

Merge "Merge "Handle close transitions for freeform tasks." into udc-qpr-dev am: 31634ca8" into udc-qpr-dev-plus-aosp am: 07180ac3

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



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