Merge "DO NOT MERGE Revert "use new TelephonyManager API preferred_network_type"" into pi-dev-plus-aosp