Merge "Pass in correct user to AccountManagerBackupHelper"