Please cherry pick fix for issue 28610 into the 1.22.0.dev

[a-siva]

Please cherry pick fix for #28610 into the 1.22.0.dev branch
The Cl that fixes it is 1ff4a5a

[whesse]

This cherry-pick does not merge. It depends on the the commit 97f968d
which is not in 1.22 because it was landed after the last full push to dev.

Either this fix is not needed, because teh issue was introduced by that prior CL, or that prior CL needs to be cherry-picked as well to 1.22.

[eernstg]

I believe this was settled in #28610: The whole generic function type syntax feature is at milestone 1.23; in 1.22 we only deprecate certain usages of the identifier Function, such that we will have fewer update conflicts when this syntax is introduced.

[a-siva]

Sorry my bad I was under the impression that it went into 1.22. will close this issue.