[automerger skipped] Merge "Revert "use new TelephonyManager API preferred_network_type""
am: 097ae1c3f3  -s ours

Change-Id: I0cdc8196edfcf5bbd8d22c56478ed2e8a30af417