Merge "[SettingsProvider] use a mock SettingsProvider in unit test" into udc-qpr-dev