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

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



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