Merge pull request #20127 from DouglasSherk/1017831-intermittent-simsettingshelper

Bug 1017831 - Fix intermittently failing SimSettingsHelper._setToSettingsDB test. r=eragonj