Merge "Request transition for corner case of keyguard state" into udc-dev am:...

Merge "Request transition for corner case of keyguard state" into udc-dev am: 22060ac4 am: e8bd36a6

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



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