Merge branch 'cherry-pick-e778803e-22.0' into '22.0'

Sweeping !56210 from master to 22.0.
MuonConfig - Fix test failureCloses ATLASRECTS-7230

See merge request atlas/athena!56218

Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvConfig.py

@@ -163,6 +163,9 @@ def ITkTrackParticleCnvAlgCfg(flags, name="ITkTrackParticleCnvAlg", TrackContain
 
 def MuonTrackParticleCnvCfg(flags, name = "MuonTrackParticleCnvAlg",**kwargs):
     result=ComponentAccumulator()
+    from BeamSpotConditions.BeamSpotConditionsConfig import BeamSpotCondAlgCfg
+    result.merge(BeamSpotCondAlgCfg(flags))
+
 
     if "TrackParticleCreator" not in kwargs:
         from TrkConfig.TrkParticleCreatorConfig import MuonCombinedParticleCreatorCfg