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

[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8 am: 02b52531 -s ours am: d17cc272 -s ours

am skip reason: subject contains skip directive

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



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