Sweeping !16564 from 21.0 to master. Fix FastCaloSim Coverity issue 115466 (ATLASSIM-3684) See merge request atlas/athena!16680 Former-commit-id: 4a084ce7