[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 65091e4cac -s ours

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

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

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