Fix errorprone warnings that should be errors am: 598f1fad23 am: efb78af776 am: b4036bde78

Original change: https://android-review.googlesource.com/c/platform/external/junit-params/+/2256448

Change-Id: Id2c4737796b891505106781a6175fddd0d70190e
Signed-off-by: Automerger Merge Worker <[email protected]>