Merge "Revert "Use a SLEEP transition to trigger failsafe animation...

Merge "Revert "Use a SLEEP transition to trigger failsafe animation cancelling"" into udc-dev am: a9c9e9ef am: 3de063aa

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



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