Merge "Fix errorprone warnings that should be errors" am: 7f0a82177e am: 35ece4698b am: 0a0225c9c7

Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2254754

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 031a040..762b32d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -72,7 +72,10 @@
     installable: true,
     hostdex: true,
     errorprone: {
-        javacflags: ["-Xep:MissingOverride:OFF"],
+        javacflags: [
+            "-Xep:MissingOverride:OFF",
+            "-Xep:LockOnBoxedPrimitive:WARN",
+        ],
     },
     lint: {
         warning_checks: ["SuspiciousIndentation"],