Manual sweep of !31089 (Add gas gap dependency to RpcHitIdHelper)

Hi,

since the automatic sweep of !31089 (merged) into 21.3 and 21.9 failed, this is the manual sweep.

Best, Nico