Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into...
Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e7604
automerge: 76e9d180
* commit '76e9d180':
Fixed a crash in TelephonyManager while calling getDeviceID()