Merge "Update the SettingsProvider OWNERS file"