Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into sc-dev