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

Merge "[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: e855f9c3 -s ours am: 7c4da0eb -s ours am: aebe4548 -s ours am: cf19e194 -s ours" into tm-d1-dev-plus-aosp am: bd74af91

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



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