[automerger skipped] DO NOT MERGE Dismiss keyguard when simpin auth'd and... am: 09f0047222 am: a4ff8bed4c -s ours am: a42e85b022 -s ours

am skip reason: subject contains skip directive

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

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