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

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

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