[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661a6 am: 2ebce335cc -s ours am: 13ac3a30cc -s ours am: 57bf672813 -s ours am: eda0a9c3e0 -s ours am: 82c23bb895 -s ours am: 10176ef200 -s ours am: 599518d051 -s ours

am skip reason: subject contains skip directive

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

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