[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after...

[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f1 am: b60a1914 -s ours am: 78ebce58 -s ours am: f18df571 -s ours am: 42c590db -s ours am: 52d17775 -s ours

am skip reason: subject contains skip directive

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



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