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

java/README.md

diff --git a/java/README.md b/java/README.md
index d27fae2..91bf8a2 100644
--- a/java/README.md
+++ b/java/README.md
@@ -44,9 +44,9 @@
 ### Gradle
 
 If you are using Gradle, add the following to your `build.gradle` file's
-dependencies: `implementation 'com.google.protobuf:protobuf-java:3.22.3'`
-Again, be sure to check that the version number matches (or is newer than) the
-version number of protoc that you are using.
+dependencies: `implementation 'com.google.protobuf:protobuf-java:3.22.3'` Again,
+be sure to check that the version number matches (or is newer than) the version
+number of protoc that you are using.
 
 ### Use Java Protocol Buffers on Android