Merge "Remove dead method from TelephonyManager"