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

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



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