Merge "Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"" into rvc-dev