[automerger skipped] Merge "Redesign the setPreferredNetworkType" am:...
[automerger skipped] Merge "Redesign the setPreferredNetworkType" am: 126623b9 am: fd415214 am: 5718d2e5 -s ours
am skip reason: Change-Id I3198131246e3206e856457d336fbead46340a24b with SHA-1 800b9f4f is in history
Change-Id: I7722803d144e87f0d4494300fdb3a1d37134cdf7