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

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

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