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