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