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

am skip reason: subject contains skip directive

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

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