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

Change-Id: I0a928e1f64eec1b05cdba7bedeb3d294eb270b51