[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: e53e389f -s ours am: d05aafbc -s ours am: ecca4988 -s ours am: 9325dc44 -s ours

am skip reason: subject contains skip directive

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



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