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

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

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