[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK...

[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: e53e389f -s ours am: d05aafbc -s ours

am skip reason: subject contains skip directive

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



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