[automerger skipped] Merge "Redesign the setPreferredNetworkType" am: eeddb1748b am: 0113e5d7a4 am: 21b386e45d -s ours
am skip reason: Change-Id Iaec153d001ced49908dcb9a4410d857b3aea9b05 with SHA-1 0ac9c1ae89 is in history

Change-Id: Iee66e2523a6a62d22b1412a46a04b0c1dae4c721