Merge "Allow multiple close transactions for task view" into udc-qpr-dev am:...

Merge "Allow multiple close transactions for task view" into udc-qpr-dev am: b47e5294 am: b3548d0b

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



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