[automerger skipped] DO NOT MERGE Dismiss keyguard when simpin auth'd and......

[automerger skipped] DO NOT MERGE Dismiss keyguard when simpin auth'd and... am: 09f00472 am: a4ff8bed -s ours am: a42e85b0 -s ours am: f2f6a0e5 -s ours am: 64091a4a -s ours

am skip reason: subject contains skip directive

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



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