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: 3596a2ed am: f353e32f am: 911f2a41

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



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