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

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

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



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