Merge pull request #14622 from protocolbuffers/win2019-23.x

Backport CI fixes to 23.x