Merge "Redesign the setPreferredNetworkType"
am: 53b272d680

Change-Id: I9dec551a3aeb71edd52d33d1e92bb385bca7cf19