Move the signalling of aps_params_type to an earlier position and change the signalling of aps_adaptation_parameter_set_id

AHG Recommendation (cleanup): Just change the order to put the type before the ID.