Merge "Use a SLEEP transition to trigger failsafe animation cancelling" into udc-dev am: 427613c5

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



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