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

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



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