Merge "Bring back Keyguard CANNED_UNLOCK_START_DELAY wait" into udc-dev am: c42b01e3

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



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