Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev