Merge "Fix errorprone warnings that should be errors" am: e4cddf0555 am: 8455c9ae16

Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/2255051

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