Fix errorprone warnings that should be errors am: 4d1c164550 am: 49c712c2b7 am: f6ebb1afd8

Original change: https://android-review.googlesource.com/c/platform/external/testng/+/2256804

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