[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: 57bf6728 -s ours am: eda0a9c3 -s ours am: f3363b38 -s ours am: 5a382d18 -s ours

am skip reason: subject contains skip directive

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



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