Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760
automerge: 76e9d18

* commit '76e9d18055d131bede49886c9c86c9f59db3fac4':
  Fixed a crash in TelephonyManager while calling getDeviceID()