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

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

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