Merge "Do not dismiss keyguard after SIM PUK unlock" into tm-qpr-dev am: 7c4684ee

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



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