Merge "Pull backup password logic out of BackupManagerService"