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

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

Change-Id: Ice77912be84219c4742e97afda865eeb723ce924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index fa02f9d..ed0ade3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,6 +79,7 @@
     errorprone: {
         javacflags: [
             "-Xep:CollectionIncompatibleType:WARN",  // b/74213384
+            "-Xep:BoxedPrimitiveEquality:WARN",
         ],
     }
 }