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

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



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