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: 052b6c99 -s ours am: 03f301f5 -s ours am: 0f72285e -s ours" into udc-dev