HITL: Resolve Conflict 409 in API server when user actions at nearly timeout#55243

Lee-W merged 2 commits intoapache:mainapache/airflow:mainfrom

sjyangkevin:issues/55054/hitl-409-conflictsjyangkevin/airflow:issues/55054/hitl-409-conflictCopy head branch name to clipboard