Merge "Remove getIntWithSubId in TelephonyManager."