[automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am:...

[automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1f am: d97cb511 -s ours am: daa07ea2 -s ours am: efb6d09d -s ours am: 18a663c9 -s ours

am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e170 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368

Change-Id: I3ac6bcd527bc8293d189df29be2dd8228b23c03a