Merge "use new TelephonyManager API preferred_network_type" am: e61bda70eb
am: 7d3684a86c

Change-Id: I4dc4f61d545f44eda7be5e53882a2560e2e257a8