Merge "Fix CTS case testGetDeviceId of TelephonyManagerTest"