[automerger skipped] Merge "Mainline: removed legacy UI for network selection...

[automerger skipped] Merge "Mainline: removed legacy UI for network selection mode." am: 6afb84d6 am: 0f951e1b -s ours am: 9a8905db -s ours am: 42e2ea29 -s ours am: e03c8378 -s ours

am skip reason: Change-Id I1a0f431f05268d29afce145c3eb720594cfc57a3 with SHA-1 affe5406 is in history

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

Change-Id: I6e7925ae8e07ea851b6387988d13dbbaee395f1a