[automerger skipped] Merge "Redesign the setPreferredNetworkType" am: 53b272d680 am: c64805d392 am: 4970e69471 -s ours
am skip reason: Change-Id Ia257e6ddaa33c32bc09340a59c9daf71ce1fa8cf with SHA-1 d11c1218d5 is in history

Change-Id: I9b9129bf5e20aa5bbfcdc62cb1d17a1969a1c3fc