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

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



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