Merge the latest main to protobuf-4.x-rc branch #4017

✅ All contributors are covered under a CLA with Google

See https://cla.developers.google.com/ for more info about Google's Contributor License Agreement (CLA).

ℹ️ Googlers: Go here to view more details and manage scans for this pull request.

@blakeli0

The following contributors were found for this pull request:

✅ a694bf8 Author: @blakeli0 <bl****i@google.com>
✅ 46b2cee Author: @diegomarquezp <die*******ezp@google.com>
✅ b250e2d Author: @cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com>
✅ c931e1b Co-Author: @release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
✅ 480cf13 Author: @renovate-bot <b**@renovateapp.com>

(Only the first commit for a unique contributor is listed.)