Merge 22.x to main (#12494)

Closes #12494

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12494 from protocolbuffers:main-202304181855 4e23571384090b867152cd2233220afde01f3b70
PiperOrigin-RevId: 525263110

zhangskz committed 3y ago

22d0a354a05a5e8d6f43edaf5ea4f4dbd9dfb8a7

Parent: 0603373

Committed by Copybara-Service <copybara-worker@google.com> on 4/18/2023, 10:09:20 PM