Merge "google-java-format: remove sorting import argument" into main am: c2c8692c55

Original change: https://android-review.googlesource.com/c/platform/tools/repohooks/+/3112466

Change-Id: I06fcaa0c85dd81851914781fe9e0318653d1c078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>