am 60a5b946: Merge "Add exception handling to getIccSimChallenge()" into mnc-dev

* commit '60a5b946391d1bf131cb986c5995a298d1c7ad65':
  Add exception handling to getIccSimChallenge()