[automerger skipped] Merge "Request keyguard dismissal from suspend dialog" into rvc-dev am: 08e440cab2 am: 2a5c2175d4 -s ours
am skip reason: Change-Id Ie3b5e2903804bc8b385de4fc9276dd55a8108c0f with SHA-1 e6d0f75017 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11990656
Change-Id: I8d40b56c524a9f7d764d874b1766ff7bd24586e8
This commit is contained in: