[automerger skipped] Merge "Redesign the setPreferredNetworkType" am: 2e002bac82 am: 21cc1d2f19 am: 6beaff255f -s ours
am skip reason: Change-Id I5902509d79608c7aae697fbb247c7904f8d098a1 with SHA-1 846d9646c0 is in history

Change-Id: If5a3fdd4de4fa9b6c3ea78974e4926dfe79680c0