Merge "[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard...

Merge "[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f1 am: 1bc51470 -s ours am: c64e0d70 -s ours am: aff81a55 -s ours am: 1b1dc203 -s ours" into tm-d1-dev-plus-aosp am: fd2105e9 -s ours am: 76cf756a -s ours

am skip reason: subject contains skip directive

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



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