Merge "Redesign the setPreferredNetworkType" am: eeddb1748b am: 0113e5d7a4

Change-Id: I1337086c91b1195c99878622b7ac07293ed5b7df