Merge "SettingsBackupAgent: Remove redundant size parameter"