[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: c27cf661 am: 2ebce335 -s ours am: 13ac3a30 -s ours am: 7ef1e5f3 -s ours am: 65ea1811 -s ours am: e06f4746 -s ours am: e9ccd9db -s ours

am skip reason: subject contains skip directive

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



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