Merge "Update the SettingsProvider OWNERS file" am: 3a4e4452b2

Change-Id: Ibd95d15922b7da7934042d447b800fb8100d6a47