diff --git a/Android.bp b/Android.bp
index 20f86349413..f5b593da6a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -123,6 +123,13 @@ android_library {
         "androidx.room_room-compiler-plugin",
     ],
 
+    errorprone: {
+        extra_check_modules: ["//external/nullaway:nullaway_plugin"],
+        javacflags: [
+            "-XepOpt:NullAway:AnnotatedPackages=com.android.settings",
+        ],
+    },
+
     libs: [
         "telephony-common",
         "ims-common",