Merge "Redesign the setPreferredNetworkType"
am: 2e002bac82

Change-Id: I4ea65fa98e007aff120e00992f00036935710475