Merge "Revert "use new TelephonyManager API preferred_network_type""