Merge Android 24Q1 Release (ab/11220357)

Bug: 319669529
Merged-In: Id51dab308ea8b76e335226d555f6b327f6de281e
Change-Id: I3acad682b4cf6c6ad9bcb2ce91d845b21a9f133a
diff --git a/Android.bp b/Android.bp
index ce42ba2..80a73b5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -103,7 +103,10 @@
     sdk_version: "current",
     optimize: {
         proguard_flags_files: ["proguard.flags"],
-    }
+    },
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
 
 android_library {
@@ -128,5 +131,8 @@
     sdk_version: "current",
     optimize: {
         proguard_flags_files: ["proguard.flags"],
-    }
+    },
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }