Resolve issues in test test_add_asset_activate_conflict

[dstandish]

Body

Either the test isn't working right, or there's a bug, because whene you enable serdag storage on dag maker, this test breaks: test_add_asset_activate_conflict.

Marking xfail in #50359

Committer

• I acknowledge that I am a maintainer/committer of the Apache Airflow project.