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

am skip reason: subject contains skip directive

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

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