Merge "Prevent cancel entering split due to animation got canceled" into...

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

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



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