Fix errorprone 2.15.0 errors am: 619c303eb9 am: 0cc12ab559 am: b9e0c278de am: 48c49c5532

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

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