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