Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b7

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



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