Merge "Fix errorprone warnings that should be errors" am: ea4d7833fb am: 2eca2e750b

Original change: https://android-review.googlesource.com/c/platform/external/antlr/+/2256447

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