Fix HltPackedDataDecoder regression from future merge
This partially reverts some conflict resolutions made in ef38fd43 which undid some fixes to the HltPackedDataDecoder
algorithm, specifically parts of MRs !158 (merged), !521 (merged), and !567 (merged).
Spotted due to a failing DaVinci test on master.