Merge "Make the transition sleep failsafe stricter" into udc-dev am: e08f57dd

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



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