Fix false positives for extra_unused_type_parameters
#10321
Merged
extra_unused_type_parameters
#10321