[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: 1bc51470 -s ours am: c64e0d70 -s ours am: aff81a55 -s ours

am skip reason: subject contains skip directive

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



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