Manual cherry-pick of MR 45777 to 22.0-mc20 - Reorder TrackingGeometry deps for serial athena
Manual cherry-pick of MR !45777 (merged) to 22.0-mc20 - (Reorder TrackingGeometry deps for serial athena) to speed up CI testing in this branch.
Manual cherry-pick of MR !45777 (merged) to 22.0-mc20 - (Reorder TrackingGeometry deps for serial athena) to speed up CI testing in this branch.