am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev

* commit '9a4472bf45044082f4fa6d906530f3640761676a':
  Unable to unlock SIM with a PIN/PUK