Merge "Bring back Keyguard CANNED_UNLOCK_START_DELAY wait" into udc-dev