Merge branch 'cherry-pick-867ad363 [formerly 24dd1cfe84]-master' into 'master'
Sweeping !12140 from 21.1 to master.
ATONLBS-21: Edited TotalTracks and TotalTracksPass Histograms for BeamSpot Monitoring
See merge request atlas/athena!12185
Former-commit-id: 06102934