[automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea
am: d97cb511ac
-s ours am: daa07ea2d6
-s ours am: efb6d09d0f
-s ours am: 18a663c92d
-s ours
am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e1707a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368
Change-Id: I3ac6bcd527bc8293d189df29be2dd8228b23c03a
This commit is contained in: