Merge "Give Keyguard 2 seconds to finish before SLEEP" into udc-dev am: 26f32604 am: 9d215d9a

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



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