Merge "SettingsProvider: Use new API for softap config backup/restore"