Merge "Only cancel recent animation for change transition including display"...

Merge "Only cancel recent animation for change transition including display" into udc-qpr-dev am: ca88ae4d

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



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