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

Change-Id: I5d6af829aae7c94b7047c911edaecb99450460d5