[automerger skipped] Merge "Update the SettingsProvider OWNERS file" into...
[automerger skipped] Merge "Update the SettingsProvider OWNERS file" into rvc-dev am: c0935538 am: 5d50ada4 am: f937acbc am: 68165e1f -s ours
am skip reason: Change-Id I9a25ce97210178767e69226b24fce6d4d0649f1d with SHA-1 06e1ba78 is in history
Change-Id: I452289669860f71153fa4c984791800862e0aff3