Merge "Revert "Revert "use new TelephonyManager API preferred_network_type"""
am: bb3b386699

Change-Id: Ibb350159f577811804543da59b0225aa86ebb2ce