Merge "[automerger skipped] Merge "Update the SettingsProvider OWNERS file" into rvc-dev am: c0935538 -s ours am: 8631c873 -s ours" into rvc-d1-dev-plus-aosp am: 8d0e719e -s ours

am skip reason: Change-Id I9a25ce97210178767e69226b24fce6d4d0649f1d with SHA-1 06e1ba78 is in history

Change-Id: I3ab79790352a36210b72acacf8faab02d9104bca