Fix bad merge (#25371)

server/channels/app/import_functions.go

@@ -591,7 +591,7 @@ func (a *App) importUser(rctx request.CTX, data *imports.UserImportData, dryRun
 			}
 		}
 		if password != "" {
-			if appErr = a.UpdatePassword(c, user, password); appErr != nil {
+			if appErr = a.UpdatePassword(rctx, user, password); appErr != nil {
 				return appErr
 			}
 		} else {