This includes some cleanup to make the parameters match between BackupService.onBackup and FileBackupHelper.performBackup.
It took a bunch of refactoring inside BackupManagerService, which is unfortunately all temporary anyway, but it unblocks a bunch of stuff.