Merge "Add OWNERS for SettingsProvider." am: 18bece7b32 am: af8a6c724f am: aefd9fd950
am: 0b619db6ff

Change-Id: I53a925154bb66d7312cc0f5f34d210c9c1f88b41