Merge "NetworkModePreference's list needs to allow values set from overlay."...

Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8a am: 914f8e7d

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

Change-Id: Ia3b9d654d0d62e10daec80c1b5e05b9739f62272