Merge "Redesign the setPreferredNetworkType"
am: eeddb1748b

Change-Id: I1ee2372e2ec0aa8938dcd821a0c42936df2300e3