Merge remote-tracking branch 'refs/remotes/upstream/main' into sync-s…

…tage

# Conflicts:
#	src/google/protobuf/compiler/objectivec/objectivec_enum.cc
#	src/google/protobuf/compiler/objectivec/objectivec_extension.cc
#	src/google/protobuf/compiler/objectivec/objectivec_field.cc
#	src/google/protobuf/compiler/objectivec/objectivec_file.cc
#	src/google/protobuf/compiler/objectivec/objectivec_generator.cc
#	src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
#	src/google/protobuf/compiler/objectivec/objectivec_message.cc
#	src/google/protobuf/compiler/objectivec/objectivec_oneof.cc
#	src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
#	src/google/protobuf/compiler/plugin.pb.h
#	src/google/protobuf/descriptor.pb.h