Merge "Fix flickering when cancel cross activity animation." into udc-qpr-dev...

Merge "Fix flickering when cancel cross activity animation." into udc-qpr-dev am: 672de429 am: 4f743e58

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



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