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

Merge "[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661 am: 2ebce335 -s ours am: 13ac3a30 -s ours am: 7ef1e5f3 -s ours am: 65ea1811 -s ours am: e06f4746 -s ours am: 841bc866 -s ours" into tm-d1-dev-plus-aosp