Merge "Redesign the setPreferredNetworkType" am: 53b272d680 am: c64805d392

Change-Id: I9580cbe5bc5d56678a2b14c9daee466209ffe045