Merge "[Multi-user] Change more BackupManager AIDL methods to accept userId in methods"