[automerger skipped] Merge "Update the SettingsProvider OWNERS file" into...
[automerger skipped] Merge "Update the SettingsProvider OWNERS file" into rvc-dev am: c0935538 am: 5d50ada4 -s ours
am skip reason: Change-Id I9a25ce97210178767e69226b24fce6d4d0649f1d with SHA-1 3426c0b4 is in history
Change-Id: I8f9d8cdcb3867a6466f0b9bddae0740faf149ef8