[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am:...

[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5d -s ours am: 65091e4c -s ours am: 1516a9c1 -s ours

am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f1 is already in history

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



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