Merge "Snap for 9550355 from 35ece4698b5c3f2c7c6a3b3911ca85cd240cd45e to sdk-release" into sdk-release
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"],