[automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea
am: d97cb511ac
-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: I4fe7fe78122bfd753f9c407a5e3013c0886d4623
This commit is contained in: