Merge branch 'cherry-pick-f850582f [formerly 48e94b66]-21.0-mc16d' into '21.0-mc16d'

Sweeping !7084 from master to 21.0-mc16d.
Fix issue of the electron IsEM selector returning a StatusCode when it needed to return an int

See merge request atlas/athena!7141

Former-commit-id: 35050cbac1b6ebcf3675bb0d1c78809f8e676a21

PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronIsEMSelector.cxx

@@ -517,7 +517,7 @@ unsigned int AsgElectronIsEMSelector::TrackCut(const xAOD::Electron* eg,
     ATH_MSG_ERROR("Something is bad with the variables as passed");
     // if object is bad then use the bit for "bad eta"
     iflag = (0x1 << egammaPID::ClusterEtaRange_Electron); 
-    return StatusCode::SUCCESS; 
+    return iflag; 
   }
  
   // Track quality cuts