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: d117926c

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



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