Merge "[SettingsProvider] fix WriteFallbackSettingsFilesJobService holding wakelock" into rvc-qpr-dev