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

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