Merge "Add a SettingsProvider key for Adaptive connectivity"