Merge "[SettingsProvider] fix WriteFallbackSettingsFilesJobService holding wakelock"