Merge "Prevent cancel entering split due to animation got canceled" into tm-qpr-dev am: 788f62ae

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



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