diff --git a/Android.bp b/Android.bp
index a56cc19..b598a1f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,12 +122,13 @@
 
     plugins: ["androidx.room_room-compiler-plugin"],
 
-    errorprone: {
-        extra_check_modules: ["//external/nullaway:nullaway_plugin"],
-        javacflags: [
-            "-XepOpt:NullAway:AnnotatedPackages=com.android.settings",
-        ],
-    },
+    // TODO: b/307330031 - Re-enable the nullaway plugin when the issue is fixed.
+    // errorprone: {
+    //     extra_check_modules: ["//external/nullaway:nullaway_plugin"],
+    //     javacflags: [
+    //         "-XepOpt:NullAway:AnnotatedPackages=com.android.settings",
+    //     ],
+    // },
 
     libs: [
         "telephony-common",