[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: 898d578f -s ours am: 9b928f81 -s ours am: 052b6c99 -s ours am: 03f301f5 -s ours am: f7f7bbfc -s ours

am skip reason: subject contains skip directive

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



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