Merge "Add SettingsProvider team as OWNERS of android.provider.Settings"