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

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

Change-Id: I924680694eb54be8e4447e873aa195aa1f5c19c4