Merge branch 'cherry-pick-6f9265a4 [formerly 0d9211b8ed]-master' into 'master'

Sweeping !9759 from 21.3 to master.
Update AmdcStand for phase-2 layouts

See merge request atlas/athena!9981

Former-commit-id: 9a4f201c

MuonSpectrometer/Amdcsimrec/AmdcStand/AmdcStand/amdcsim_com.inc

@@ -63,7 +63,7 @@
      &               INOCUT(MTYP,MGEO,4),                                  &
      &               NOBCUT(MCUT),     IOBCUT(MCUT,MOCU)
 !----------------------------
-      INTEGER, PARAMETER :: MSTA=25
+      INTEGER, PARAMETER :: MSTA=30
       REAL(8) :: STAX0,STAPP,STARR,STAEE,STAPG,STATT,STAOO
       INTEGER :: NLAZ,NLAS,ISTAMA,IFORMA,IVALIDSTA
       COMMON/AMDCCHASTA/                                                   &