Merge "Add null check in BackupManagerService$PerformBackupTask.handleCancel()"