Merge "use new TelephonyManager API preferred_network_type"
am: e61bda70eb

Change-Id: I635401ca1f83922b4eabb916e68f63dd8713ca82