[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 am: b60a19142f -s ours am: 78ebce58a8 -s ours am: f18df571a5 -s ours am: 42c590db71 -s ours

am skip reason: subject contains skip directive

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

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