Merge "Make the SettingsProvider CTS test less flaky" into jb-mr1-dev