Merge "Remove methods added in TelephonyManager."