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

Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b7 am: f3c6684b -s ours am: 5ddcc96b -s ours am: b7075acb -s ours am: 97f62577 -s ours am: 605261cc -s ours am: 1e7904dd -s ours am: e8b730b5 -s ours am: df8c08f7 -s ours" into tm-d1-dev-plus-aosp