am 3f76f124: Merge "Fix CTS case testGetDeviceId of TelephonyManagerTest"

* commit '3f76f124ab878e0c1369f17ca9ca72d9a4d557c4':
  Fix CTS case testGetDeviceId of TelephonyManagerTest