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

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