Merge "Updates to Settings.Config and SettingsProvider for the DeviceConfig API surface."