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