Merge "Give Keyguard 2 seconds to finish before SLEEP" into udc-dev am:...

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

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



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