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

Change-Id: Ia0101eb77c4990052e37ad2479fff9fc2525065d