[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: af49821b -s ours am: 89cf5eee -s ours am: 47b60be6 -s ours am: ae168942 -s ours am: 2346ddc2 -s ours

am skip reason: subject contains skip directive

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



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