Merge "Clean new TelephonyManager API."