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