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

Change-Id: I23a6d7379e6fc2f70b9b8f20850f4c211a6df5b9