These will be used by third_party/protobuf in a follow-up.

Also update a test that uses protobuf and that will break when protobuf is
updated (since the test can't be changed in the same PR as third_party/).

Break-out of #9019. Closes #9048. Work toward #9006.

RELNOTES: None
PiperOrigin-RevId: 261176215