[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: c3e074a7 -s ours am: 33b915ab -s ours am: 0108ff97 -s ours am: 7f601788 -s ours am: c109d1cb -s ours am: 1ca23b36 -s ours

am skip reason: subject contains skip directive

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



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