Merge "Redesign the setPreferredNetworkType" am: 2e002bac82 am: 21cc1d2f19

Change-Id: If35cfc2cac9b9139527defe0184bb30379728a48