Merge "Use shell transitions to finalize cancel-to-desktop" into udc-qpr-dev...

Merge "Use shell transitions to finalize cancel-to-desktop" into udc-qpr-dev am: 2da628f9 am: b48411e4

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



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