BanTargetApiAnnotation check now actually looks for the annotation
and not usages of methods annotated by it.

Also fixes b/120615476

Bug: 120615476
Test: gw lintDebug
Change-Id: I61ae15ef0150dc160c7848e9577eba60260c1198
diff --git a/activity/activity/lint-baseline.xml b/activity/activity/lint-baseline.xml
index 194adfa..01461ae 100644
--- a/activity/activity/lint-baseline.xml
+++ b/activity/activity/lint-baseline.xml
@@ -2,6 +2,61 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="    @TargetApi(18)"
+        errorLine2="    ~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.java"
+            line="458"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="    @TargetApi(19)"
+        errorLine2="    ~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.java"
+            line="521"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="    @TargetApi(19)"
+        errorLine2="    ~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.java"
+            line="559"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="    @TargetApi(21)"
+        errorLine2="    ~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.java"
+            line="601"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="    @TargetApi(19)"
+        errorLine2="    ~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.java"
+            line="640"
+            column="5"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 16, the call containing class androidx.activity.result.contract.ActivityResultContracts.GetMultipleContents is not annotated with @RequiresApi(x) where x is at least 16. Either annotate the containing class with at least @RequiresApi(16) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(16)."
         errorLine1="            ClipData clipData = intent.getClipData();"
diff --git a/ads/ads-identifier-common/lint-baseline.xml b/ads/ads-identifier-common/lint-baseline.xml
index e49f859..5004ec4 100644
--- a/ads/ads-identifier-common/lint-baseline.xml
+++ b/ads/ads-identifier-common/lint-baseline.xml
@@ -4,12 +4,12 @@
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public class AdvertisingIdUtils {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/ads/identifier/AdvertisingIdUtils.java"
-            line="36"
-            column="1"/>
+            line="42"
+            column="14"/>
     </issue>
 
 </issues>
diff --git a/biometric/biometric/lint-baseline.xml b/biometric/biometric/lint-baseline.xml
index 4b736bf..c3dfc0b 100644
--- a/biometric/biometric/lint-baseline.xml
+++ b/biometric/biometric/lint-baseline.xml
@@ -19,7 +19,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/biometric/BiometricFragment.java"
-            line="469"
+            line="534"
             column="29"/>
     </issue>
 
diff --git a/camera/camera-core/lint-baseline.xml b/camera/camera-core/lint-baseline.xml
index d185cbf..0d8d2d8 100644
--- a/camera/camera-core/lint-baseline.xml
+++ b/camera/camera-core/lint-baseline.xml
@@ -467,22 +467,11 @@
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
         errorLine1="    private static final class Speed {"
-        errorLine2="    ^">
+        errorLine2="                               ~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/utils/Exif.java"
             line="627"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 26, the call containing class androidx.camera.core.VideoCapture is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="                    mediaMuxer = new MediaMuxer(mParcelFileDescriptor.getFileDescriptor(),"
-        errorLine2="                                 ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="973"
-            column="34"/>
+            column="32"/>
     </issue>
 
     <issue
diff --git a/camera/camera-testing/lint-baseline.xml b/camera/camera-testing/lint-baseline.xml
index 4cb2529..b2f4853 100644
--- a/camera/camera-testing/lint-baseline.xml
+++ b/camera/camera-testing/lint-baseline.xml
@@ -26,28 +26,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraUseCaseAdapter getCameraUseCaseAdapter(@NonNull Context context,"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="273"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraUseCaseAdapter getCameraAndAttachUseCase(@NonNull Context context,"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="299"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void setAfMode(CameraCaptureMetaData.AfMode mode) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -118,7 +96,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="86"
+            line="85"
             column="53"/>
     </issue>
 
diff --git a/camera/camera-view/lint-baseline.xml b/camera/camera-view/lint-baseline.xml
index 52dd67a..d676298 100644
--- a/camera/camera-view/lint-baseline.xml
+++ b/camera/camera-view/lint-baseline.xml
@@ -2,13 +2,24 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="    @TargetApi(24)"
+        errorLine2="    ~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/view/SurfaceViewImplementation.java"
+            line="117"
+            column="5"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 29, the call containing class androidx.camera.view.PreviewView is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
         errorLine1="            saveAttributeDataForStyleable(context, R.styleable.PreviewView, attrs, attributes,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/view/PreviewView.java"
-            line="199"
+            line="220"
             column="13"/>
     </issue>
 
@@ -19,7 +30,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/view/SurfaceViewImplementation.java"
-            line="125"
+            line="130"
             column="19"/>
     </issue>
 
diff --git a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
index dd179cc..6ca24fd 100644
--- a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
+++ b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
@@ -3,17 +3,6 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.camera.integration.uiwidgets.rotations.CameraActivity is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="            requestPermissions(PERMISSIONS, REQUEST_CODE_PERMISSIONS)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/uiwidgets/rotations/CameraActivity.kt"
-            line="59"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.camera.integration.uiwidgets.ViewPager2Activity is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
         errorLine1="                requestPermissions("
         errorLine2="                ~~~~~~~~~~~~~~~~~~">
diff --git a/camera/integration-tests/viewtestapp/lint-baseline.xml b/camera/integration-tests/viewtestapp/lint-baseline.xml
index 4d7d74d..6ceb126 100644
--- a/camera/integration-tests/viewtestapp/lint-baseline.xml
+++ b/camera/integration-tests/viewtestapp/lint-baseline.xml
@@ -261,7 +261,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/PreviewViewFragment.java"
-            line="240"
+            line="305"
             column="46"/>
     </issue>
 
diff --git a/compose/test-utils/lint-baseline.xml b/compose/test-utils/lint-baseline.xml
index ed9d9af..f07f740 100644
--- a/compose/test-utils/lint-baseline.xml
+++ b/compose/test-utils/lint-baseline.xml
@@ -13,13 +13,46 @@
     </issue>
 
     <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(Build.VERSION_CODES.Q)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
+            line="346"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(Build.VERSION_CODES.Q)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/testutils/benchmark/android/AndroidTestCaseRunner.kt"
+            line="159"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(Build.VERSION_CODES.Q)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarkHelpers.kt"
+            line="42"
+            column="1"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 28, the call containing class androidx.compose.testutils.AndroidComposeTestCaseRunner is not annotated with @RequiresApi(x) where x is at least 28. Either annotate the containing class with at least @RequiresApi(28) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(28)."
         errorLine1="            bitmap = Bitmap.createBitmap(picture)"
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="265"
+            line="275"
             column="29"/>
     </issue>
 
@@ -30,7 +63,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="338"
+            line="348"
             column="30"/>
     </issue>
 
@@ -41,7 +74,7 @@
         errorLine2="                   ~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="341"
+            line="351"
             column="20"/>
     </issue>
 
@@ -52,7 +85,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="342"
+            line="352"
             column="27"/>
     </issue>
 
@@ -63,7 +96,7 @@
         errorLine2="                   ~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt"
-            line="346"
+            line="356"
             column="20"/>
     </issue>
 
diff --git a/compose/ui/ui/lint-baseline.xml b/compose/ui/ui/lint-baseline.xml
index 9f375a4..24412c1 100644
--- a/compose/ui/ui/lint-baseline.xml
+++ b/compose/ui/ui/lint-baseline.xml
@@ -2,6 +2,28 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(Build.VERSION_CODES.LOLLIPOP)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeView.kt"
+            line="122"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(Build.VERSION_CODES.M)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/ui/platform/actionmodecallback/FloatingTextActionModeCallback.kt"
+            line="27"
+            column="1"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 23, the call containing class androidx.compose.ui.autofill.AndroidAutofillKt is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
         errorLine1="    var index = root.addChildCount(autofillTree.children.count())"
@@ -173,7 +195,7 @@
         errorLine2="            ~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeView.kt"
-            line="237"
+            line="238"
             column="13"/>
     </issue>
 
@@ -184,7 +206,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeView.kt"
-            line="239"
+            line="240"
             column="13"/>
     </issue>
 
@@ -195,7 +217,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.kt"
-            line="290"
+            line="278"
             column="27"/>
     </issue>
 
@@ -234,519 +256,13 @@
 
     <issue
         id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="    private val renderNode = RenderNode(null).apply {"
-        errorLine2="                             ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="62"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        setHasOverlappingRendering(true)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="63"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        get() = renderNode.uniqueId"
-        errorLine2="                           ~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="67"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        val wasClippingManually = renderNode.clipToOutline &amp;&amp; outlineResolver.clipPath != null"
-        errorLine2="                                             ~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="79"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.scaleX = modifier.scaleX"
-        errorLine2="                   ~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="80"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.scaleY = modifier.scaleY"
-        errorLine2="                   ~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="81"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.alpha = modifier.alpha"
-        errorLine2="                   ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="82"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.translationX = modifier.translationX"
-        errorLine2="                   ~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="83"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.translationY = modifier.translationY"
-        errorLine2="                   ~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="84"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.elevation = modifier.shadowElevation"
-        errorLine2="                   ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="85"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.rotationZ = modifier.rotationZ"
-        errorLine2="                   ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="86"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.rotationX = modifier.rotationX"
-        errorLine2="                   ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="87"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.rotationY = modifier.rotationY"
-        errorLine2="                   ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="88"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.pivotX = transformOrigin.pivotFractionX * renderNode.width"
-        errorLine2="                   ~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="89"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.pivotX = transformOrigin.pivotFractionX * renderNode.width"
-        errorLine2="                                                                        ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="89"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.pivotX = transformOrigin.pivotFractionX * renderNode.width"
-        errorLine2="                                                                        ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="89"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.pivotY = transformOrigin.pivotFractionY * renderNode.height"
-        errorLine2="                   ~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="90"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.pivotY = transformOrigin.pivotFractionY * renderNode.height"
-        errorLine2="                                                                        ~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="90"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.pivotY = transformOrigin.pivotFractionY * renderNode.height"
-        errorLine2="                                                                        ~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="90"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.clipToOutline = clip &amp;&amp; shape !== RectangleShape"
-        errorLine2="                   ~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="93"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.clipToBounds = clip &amp;&amp; shape === RectangleShape"
-        errorLine2="                   ~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="94"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.alpha,"
-        errorLine2="                       ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="97"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.clipToOutline,"
-        errorLine2="                       ~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="98"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.elevation"
-        errorLine2="                       ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="99"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.setOutline(outlineResolver.outline)"
-        errorLine2="                   ~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="101"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        val isClippingManually = renderNode.clipToOutline &amp;&amp; outlineResolver.clipPath != null"
-        errorLine2="                                            ~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="102"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        if (!drawnWithZ &amp;&amp; renderNode.elevation > 0f) {"
-        errorLine2="                                      ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="108"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.pivotX = transformOrigin.pivotFractionX * width"
-        errorLine2="                   ~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="116"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.pivotY = transformOrigin.pivotFractionY * height"
-        errorLine2="                   ~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="117"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        if (renderNode.setPosition("
-        errorLine2="                       ~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="118"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.left,"
-        errorLine2="                       ~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="119"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.top,"
-        errorLine2="                       ~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="120"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.left + width,"
-        errorLine2="                       ~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="121"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.top + height"
-        errorLine2="                       ~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="122"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.setOutline(outlineResolver.outline)"
-        errorLine2="                       ~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="125"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        val oldLeft = renderNode.left"
-        errorLine2="                                 ~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="131"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        val oldTop = renderNode.top"
-        errorLine2="                                ~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="132"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.offsetLeftAndRight(newLeft - oldLeft)"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="136"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.offsetTopAndBottom(newTop - oldTop)"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="137"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
         message="This call is to a method from API 26, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 26. Either annotate the containing class with at least @RequiresApi(26) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(26)."
-        errorLine1="        ownerView.parent?.onDescendantInvalidated(ownerView, ownerView)"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            ownerView.parent?.onDescendantInvalidated(ownerView, ownerView)"
+        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="156"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            drawnWithZ = renderNode.elevation > 0f"
-        errorLine2="                                    ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="163"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            androidCanvas.drawRenderNode(renderNode)"
-        errorLine2="                          ~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="167"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        if (isDirty || !renderNode.hasDisplayList()) {"
-        errorLine2="                                   ~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="178"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            canvasHolder.drawInto(renderNode.beginRecording()) {"
-        errorLine2="                                             ~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="179"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="                val manuallyClip = renderNode.clipToOutline &amp;&amp; clipPath != null"
-        errorLine2="                                              ~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="181"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="            renderNode.endRecording()"
-        errorLine2="                       ~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="193"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 29, the call containing class androidx.compose.ui.platform.RenderNodeLayer is not annotated with @RequiresApi(x) where x is at least 29. Either annotate the containing class with at least @RequiresApi(29) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(29)."
-        errorLine1="        renderNode.getMatrix(androidMatrix)"
-        errorLine2="                   ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.kt"
-            line="207"
-            column="20"/>
+            line="160"
+            column="31"/>
     </issue>
 
     <issue
@@ -756,7 +272,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/Wrapper.kt"
-            line="329"
+            line="355"
             column="24"/>
     </issue>
 
diff --git a/core/core/lint-baseline.xml b/core/core/lint-baseline.xml
index 3eaf7cd..4a48b40 100644
--- a/core/core/lint-baseline.xml
+++ b/core/core/lint-baseline.xml
@@ -37,100 +37,100 @@
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public class AppLaunchChecker {"
+        errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/AppLaunchChecker.java"
-            line="29"
-            column="1"/>
+            line="36"
+            column="14"/>
     </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public class ContextCompat {"
+        errorLine2="             ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/ContextCompat.java"
-            line="147"
-            column="1"/>
+            line="150"
+            column="14"/>
     </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public final class EditorInfoCompat {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/inputmethod/EditorInfoCompat.java"
-            line="45"
-            column="1"/>
+            line="48"
+            column="20"/>
     </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public final class InputConnectionCompat {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/inputmethod/InputConnectionCompat.java"
-            line="33"
-            column="1"/>
+            line="37"
+            column="20"/>
     </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="    // Inner class required to avoid VFY errors during class init."
-        errorLine2="    ^">
+        errorLine1="    private static class Api29Impl {"
+        errorLine2="                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/LocusIdCompat.java"
-            line="146"
-            column="5"/>
+            line="148"
+            column="26"/>
     </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public class NotificationCompat {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="80"
-            column="1"/>
+            line="82"
+            column="14"/>
     </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="    @RequiresApi(25)"
-        errorLine2="    ^">
+        errorLine1="    private static class Api25Impl {"
+        errorLine2="                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="757"
-            column="5"/>
+            line="758"
+            column="26"/>
     </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="    @RequiresApi(16)"
-        errorLine2="    ^">
+        errorLine1="    private static class Impl16 {"
+        errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/WindowCompat.java"
-            line="122"
-            column="5"/>
+            line="123"
+            column="26"/>
     </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="    @RequiresApi(30)"
-        errorLine2="    ^">
+        errorLine1="    private static class Impl30 {"
+        errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/WindowCompat.java"
-            line="138"
-            column="5"/>
+            line="139"
+            column="26"/>
     </issue>
 
     <issue
@@ -2054,7 +2054,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/ActivityCompat.java"
-            line="680"
+            line="697"
             column="38"/>
     </issue>
 
@@ -5112,7 +5112,7 @@
         errorLine2="                                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="940"
+            line="954"
             column="48"/>
     </issue>
 
@@ -5123,7 +5123,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1447"
+            line="1461"
             column="49"/>
     </issue>
 
@@ -5134,7 +5134,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1448"
+            line="1462"
             column="26"/>
     </issue>
 
@@ -5145,7 +5145,7 @@
         errorLine2="                         ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1449"
+            line="1463"
             column="26"/>
     </issue>
 
@@ -5156,7 +5156,7 @@
         errorLine2="                         ~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1450"
+            line="1464"
             column="26"/>
     </issue>
 
@@ -5167,7 +5167,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1476"
+            line="1490"
             column="49"/>
     </issue>
 
@@ -5178,7 +5178,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1477"
+            line="1491"
             column="26"/>
     </issue>
 
@@ -5189,7 +5189,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1478"
+            line="1492"
             column="26"/>
     </issue>
 
@@ -5200,7 +5200,7 @@
         errorLine2="                         ~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1479"
+            line="1493"
             column="26"/>
     </issue>
 
@@ -5211,7 +5211,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2029"
+            line="2043"
             column="45"/>
     </issue>
 
@@ -5222,7 +5222,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2030"
+            line="2044"
             column="26"/>
     </issue>
 
@@ -5233,7 +5233,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2063"
+            line="2077"
             column="45"/>
     </issue>
 
@@ -5244,7 +5244,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2064"
+            line="2078"
             column="26"/>
     </issue>
 
@@ -5255,7 +5255,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2098"
+            line="2112"
             column="46"/>
     </issue>
 
@@ -5266,7 +5266,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2099"
+            line="2113"
             column="40"/>
     </issue>
 
@@ -5277,7 +5277,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2737"
+            line="2775"
             column="33"/>
     </issue>
 
@@ -5288,7 +5288,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2741"
+            line="2779"
             column="29"/>
     </issue>
 
@@ -5299,7 +5299,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2752"
+            line="2790"
             column="37"/>
     </issue>
 
@@ -5310,7 +5310,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2833"
+            line="2871"
             column="27"/>
     </issue>
 
@@ -5321,7 +5321,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2938"
+            line="2989"
             column="25"/>
     </issue>
 
@@ -5332,7 +5332,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2939"
+            line="2990"
             column="34"/>
     </issue>
 
@@ -5343,7 +5343,7 @@
         errorLine2="                                 ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2940"
+            line="2991"
             column="34"/>
     </issue>
 
@@ -5354,7 +5354,7 @@
         errorLine2="                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2942"
+            line="2993"
             column="27"/>
     </issue>
 
@@ -5365,7 +5365,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2945"
+            line="2996"
             column="27"/>
     </issue>
 
@@ -5376,7 +5376,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3058"
+            line="3122"
             column="25"/>
     </issue>
 
@@ -5387,7 +5387,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3059"
+            line="3123"
             column="34"/>
     </issue>
 
@@ -5398,7 +5398,7 @@
         errorLine2="                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3060"
+            line="3124"
             column="34"/>
     </issue>
 
@@ -5409,7 +5409,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3062"
+            line="3126"
             column="27"/>
     </issue>
 
@@ -5420,7 +5420,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3391"
+            line="3468"
             column="38"/>
     </issue>
 
@@ -5431,7 +5431,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3393"
+            line="3470"
             column="38"/>
     </issue>
 
@@ -5442,7 +5442,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3397"
+            line="3474"
             column="36"/>
     </issue>
 
@@ -5453,7 +5453,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3402"
+            line="3479"
             column="40"/>
     </issue>
 
@@ -5464,7 +5464,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3414"
+            line="3491"
             column="36"/>
     </issue>
 
@@ -5475,7 +5475,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3420"
+            line="3497"
             column="36"/>
     </issue>
 
@@ -5486,7 +5486,7 @@
         errorLine2="                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3422"
+            line="3499"
             column="32"/>
     </issue>
 
@@ -5497,7 +5497,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3455"
+            line="3532"
             column="21"/>
     </issue>
 
@@ -5508,7 +5508,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3456"
+            line="3533"
             column="30"/>
     </issue>
 
@@ -5519,7 +5519,7 @@
         errorLine2="                             ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3457"
+            line="3534"
             column="30"/>
     </issue>
 
@@ -5530,7 +5530,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3843"
+            line="3920"
             column="40"/>
     </issue>
 
@@ -5541,7 +5541,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3847"
+            line="3924"
             column="40"/>
     </issue>
 
@@ -5552,7 +5552,7 @@
         errorLine2="                                     ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3853"
+            line="3930"
             column="38"/>
     </issue>
 
@@ -5563,7 +5563,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3931"
+            line="4021"
             column="25"/>
     </issue>
 
@@ -5574,7 +5574,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3932"
+            line="4022"
             column="34"/>
     </issue>
 
@@ -5585,7 +5585,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3934"
+            line="4024"
             column="27"/>
     </issue>
 
@@ -5596,7 +5596,7 @@
         errorLine2="                          ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3937"
+            line="4027"
             column="27"/>
     </issue>
 
@@ -5607,7 +5607,7 @@
         errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4030"
+            line="4133"
             column="38"/>
     </issue>
 
@@ -5618,7 +5618,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4030"
+            line="4133"
             column="47"/>
     </issue>
 
@@ -5629,7 +5629,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4148"
+            line="4251"
             column="24"/>
     </issue>
 
@@ -5640,7 +5640,7 @@
         errorLine2="                                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4432"
+            line="4535"
             column="59"/>
     </issue>
 
@@ -5651,7 +5651,7 @@
         errorLine2="                                                                             ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4433"
+            line="4536"
             column="78"/>
     </issue>
 
@@ -5662,7 +5662,7 @@
         errorLine2="                                                                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4441"
+            line="4544"
             column="69"/>
     </issue>
 
@@ -5673,7 +5673,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4449"
+            line="4552"
             column="61"/>
     </issue>
 
@@ -5684,7 +5684,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4452"
+            line="4555"
             column="54"/>
     </issue>
 
@@ -5695,7 +5695,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4455"
+            line="4558"
             column="50"/>
     </issue>
 
@@ -5706,7 +5706,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5290"
+            line="5393"
             column="33"/>
     </issue>
 
@@ -5717,7 +5717,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5299"
+            line="5402"
             column="33"/>
     </issue>
 
@@ -5728,7 +5728,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5311"
+            line="5414"
             column="31"/>
     </issue>
 
@@ -5739,7 +5739,7 @@
         errorLine2="                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5313"
+            line="5416"
             column="27"/>
     </issue>
 
@@ -5750,7 +5750,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5318"
+            line="5421"
             column="35"/>
     </issue>
 
@@ -5761,7 +5761,7 @@
         errorLine2="                                 ~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5321"
+            line="5424"
             column="34"/>
     </issue>
 
@@ -5772,7 +5772,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6067"
+            line="6170"
             column="51"/>
     </issue>
 
@@ -5783,7 +5783,7 @@
         errorLine2="                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6068"
+            line="6171"
             column="33"/>
     </issue>
 
@@ -5794,7 +5794,7 @@
         errorLine2="                                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6069"
+            line="6172"
             column="33"/>
     </issue>
 
@@ -5805,7 +5805,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6070"
+            line="6173"
             column="33"/>
     </issue>
 
@@ -5816,7 +5816,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6072"
+            line="6175"
             column="43"/>
     </issue>
 
@@ -5827,7 +5827,7 @@
         errorLine2="                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6074"
+            line="6177"
             column="33"/>
     </issue>
 
@@ -5838,7 +5838,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6100"
+            line="6203"
             column="25"/>
     </issue>
 
@@ -5849,7 +5849,7 @@
         errorLine2="                                 ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6101"
+            line="6204"
             column="34"/>
     </issue>
 
@@ -5860,7 +5860,7 @@
         errorLine2="                                 ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6102"
+            line="6205"
             column="34"/>
     </issue>
 
@@ -5871,7 +5871,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6103"
+            line="6206"
             column="34"/>
     </issue>
 
@@ -5882,7 +5882,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6104"
+            line="6207"
             column="34"/>
     </issue>
 
@@ -5893,7 +5893,7 @@
         errorLine2="                                 ~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6105"
+            line="6208"
             column="34"/>
     </issue>
 
@@ -5904,7 +5904,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6533"
+            line="6636"
             column="21"/>
     </issue>
 
@@ -5915,7 +5915,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6534"
+            line="6637"
             column="30"/>
     </issue>
 
@@ -5926,7 +5926,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6535"
+            line="6638"
             column="30"/>
     </issue>
 
@@ -5937,7 +5937,7 @@
         errorLine2="                             ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6536"
+            line="6639"
             column="30"/>
     </issue>
 
@@ -5948,7 +5948,7 @@
         errorLine2="                             ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6537"
+            line="6640"
             column="30"/>
     </issue>
 
@@ -5959,7 +5959,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6538"
+            line="6641"
             column="30"/>
     </issue>
 
@@ -5970,7 +5970,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6542"
+            line="6645"
             column="41"/>
     </issue>
 
@@ -5981,7 +5981,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6546"
+            line="6649"
             column="41"/>
     </issue>
 
@@ -5992,7 +5992,7 @@
         errorLine2="                                           ~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6550"
+            line="6653"
             column="44"/>
     </issue>
 
@@ -6003,7 +6003,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6569"
+            line="6672"
             column="59"/>
     </issue>
 
@@ -6014,7 +6014,7 @@
         errorLine2="                                                      ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6570"
+            line="6673"
             column="55"/>
     </issue>
 
@@ -6025,7 +6025,7 @@
         errorLine2="                                                                        ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6571"
+            line="6674"
             column="73"/>
     </issue>
 
@@ -6036,7 +6036,7 @@
         errorLine2="                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6572"
+            line="6675"
             column="49"/>
     </issue>
 
@@ -6047,7 +6047,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6574"
+            line="6677"
             column="46"/>
     </issue>
 
@@ -6058,7 +6058,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6576"
+            line="6679"
             column="34"/>
     </issue>
 
@@ -6069,7 +6069,7 @@
         errorLine2="                                                                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6577"
+            line="6680"
             column="65"/>
     </issue>
 
@@ -6080,7 +6080,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6580"
+            line="6683"
             column="34"/>
     </issue>
 
@@ -6091,7 +6091,7 @@
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6581"
+            line="6684"
             column="70"/>
     </issue>
 
@@ -6102,7 +6102,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6842"
+            line="6945"
             column="61"/>
     </issue>
 
@@ -6113,7 +6113,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6852"
+            line="6955"
             column="59"/>
     </issue>
 
@@ -6124,7 +6124,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6860"
+            line="6963"
             column="29"/>
     </issue>
 
@@ -6135,7 +6135,7 @@
         errorLine2="                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6861"
+            line="6964"
             column="29"/>
     </issue>
 
@@ -6146,7 +6146,7 @@
         errorLine2="                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6862"
+            line="6965"
             column="29"/>
     </issue>
 
@@ -6157,7 +6157,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6863"
+            line="6966"
             column="29"/>
     </issue>
 
@@ -6168,7 +6168,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6865"
+            line="6968"
             column="39"/>
     </issue>
 
@@ -6179,7 +6179,7 @@
         errorLine2="                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6867"
+            line="6970"
             column="29"/>
     </issue>
 
@@ -6190,7 +6190,7 @@
         errorLine2="                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6874"
+            line="6977"
             column="44"/>
     </issue>
 
@@ -6201,7 +6201,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6876"
+            line="6979"
             column="31"/>
     </issue>
 
@@ -6212,7 +6212,7 @@
         errorLine2="                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6878"
+            line="6981"
             column="44"/>
     </issue>
 
@@ -6223,7 +6223,7 @@
         errorLine2="                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6883"
+            line="6986"
             column="24"/>
     </issue>
 
@@ -6234,7 +6234,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6887"
+            line="6990"
             column="37"/>
     </issue>
 
@@ -6245,7 +6245,7 @@
         errorLine2="                                    ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6889"
+            line="6992"
             column="37"/>
     </issue>
 
@@ -6256,7 +6256,7 @@
         errorLine2="                                                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6893"
+            line="6996"
             column="75"/>
     </issue>
 
@@ -6267,7 +6267,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6896"
+            line="6999"
             column="24"/>
     </issue>
 
@@ -6278,7 +6278,7 @@
         errorLine2="                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6898"
+            line="7001"
             column="32"/>
     </issue>
 
@@ -6289,7 +6289,7 @@
         errorLine2="                                     ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6901"
+            line="7004"
             column="38"/>
     </issue>
 
@@ -6300,7 +6300,7 @@
         errorLine2="                                                                               ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6902"
+            line="7005"
             column="80"/>
     </issue>
 
@@ -6311,7 +6311,7 @@
         errorLine2="                                                                              ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6903"
+            line="7006"
             column="79"/>
     </issue>
 
@@ -6322,7 +6322,7 @@
         errorLine2="                                                                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6907"
+            line="7010"
             column="86"/>
     </issue>
 
@@ -6333,7 +6333,7 @@
         errorLine2="                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7023"
+            line="7126"
             column="33"/>
     </issue>
 
@@ -6344,7 +6344,7 @@
         errorLine2="                                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7131"
+            line="7234"
             column="33"/>
     </issue>
 
@@ -6355,7 +6355,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7147"
+            line="7250"
             column="33"/>
     </issue>
 
@@ -6366,7 +6366,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7159"
+            line="7262"
             column="33"/>
     </issue>
 
@@ -6377,7 +6377,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7172"
+            line="7275"
             column="33"/>
     </issue>
 
@@ -6388,7 +6388,7 @@
         errorLine2="                                ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7184"
+            line="7287"
             column="33"/>
     </issue>
 
@@ -6399,7 +6399,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7195"
+            line="7298"
             column="33"/>
     </issue>
 
@@ -6410,7 +6410,7 @@
         errorLine2="                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7211"
+            line="7314"
             column="44"/>
     </issue>
 
@@ -6421,7 +6421,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7226"
+            line="7329"
             column="33"/>
     </issue>
 
@@ -6432,7 +6432,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="7239"
+            line="7342"
             column="33"/>
     </issue>
 
@@ -10172,7 +10172,7 @@
         errorLine2="                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/TraceCompat.java"
-            line="78"
+            line="79"
             column="26"/>
     </issue>
 
@@ -10183,7 +10183,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/TraceCompat.java"
-            line="104"
+            line="105"
             column="19"/>
     </issue>
 
@@ -10194,7 +10194,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/TraceCompat.java"
-            line="117"
+            line="118"
             column="19"/>
     </issue>
 
@@ -10205,7 +10205,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/TraceCompat.java"
-            line="133"
+            line="134"
             column="19"/>
     </issue>
 
@@ -10216,7 +10216,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/TraceCompat.java"
-            line="153"
+            line="154"
             column="19"/>
     </issue>
 
@@ -10227,7 +10227,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/TraceCompat.java"
-            line="172"
+            line="173"
             column="19"/>
     </issue>
 
@@ -10293,7 +10293,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="753"
+            line="754"
             column="15"/>
     </issue>
 
@@ -10304,7 +10304,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="774"
+            line="775"
             column="22"/>
     </issue>
 
@@ -10315,7 +10315,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="818"
+            line="819"
             column="15"/>
     </issue>
 
@@ -10326,7 +10326,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="887"
+            line="888"
             column="22"/>
     </issue>
 
@@ -10337,7 +10337,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="937"
+            line="938"
             column="22"/>
     </issue>
 
@@ -10348,7 +10348,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="980"
+            line="981"
             column="25"/>
     </issue>
 
@@ -10359,7 +10359,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="994"
+            line="995"
             column="18"/>
     </issue>
 
@@ -10370,7 +10370,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1009"
+            line="1010"
             column="18"/>
     </issue>
 
@@ -10381,7 +10381,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1031"
+            line="1032"
             column="18"/>
     </issue>
 
@@ -10392,7 +10392,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1049"
+            line="1050"
             column="18"/>
     </issue>
 
@@ -10403,7 +10403,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1071"
+            line="1072"
             column="18"/>
     </issue>
 
@@ -10414,7 +10414,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1093"
+            line="1094"
             column="25"/>
     </issue>
 
@@ -10425,7 +10425,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1120"
+            line="1121"
             column="18"/>
     </issue>
 
@@ -10436,7 +10436,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1129"
+            line="1130"
             column="18"/>
     </issue>
 
@@ -10447,7 +10447,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1171"
+            line="1172"
             column="25"/>
     </issue>
 
@@ -10458,7 +10458,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1193"
+            line="1194"
             column="25"/>
     </issue>
 
@@ -10469,7 +10469,7 @@
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1428"
+            line="1429"
             column="55"/>
     </issue>
 
@@ -10480,7 +10480,7 @@
         errorLine2="                        ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1523"
+            line="1524"
             column="25"/>
     </issue>
 
@@ -10491,7 +10491,7 @@
         errorLine2="                 ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1537"
+            line="1538"
             column="18"/>
     </issue>
 
@@ -10502,7 +10502,7 @@
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1573"
+            line="1574"
             column="18"/>
     </issue>
 
@@ -10513,7 +10513,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1596"
+            line="1597"
             column="25"/>
     </issue>
 
@@ -10524,7 +10524,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1620"
+            line="1621"
             column="18"/>
     </issue>
 
@@ -10535,7 +10535,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1634"
+            line="1635"
             column="25"/>
     </issue>
 
@@ -10546,7 +10546,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1657"
+            line="1658"
             column="25"/>
     </issue>
 
@@ -10557,7 +10557,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1774"
+            line="1775"
             column="25"/>
     </issue>
 
@@ -10568,7 +10568,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1810"
+            line="1811"
             column="18"/>
     </issue>
 
@@ -10579,7 +10579,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1825"
+            line="1826"
             column="25"/>
     </issue>
 
@@ -10590,7 +10590,7 @@
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1841"
+            line="1842"
             column="25"/>
     </issue>
 
@@ -10601,7 +10601,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1862"
+            line="1863"
             column="18"/>
     </issue>
 
@@ -10612,7 +10612,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1885"
+            line="1886"
             column="18"/>
     </issue>
 
@@ -10623,7 +10623,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1908"
+            line="1909"
             column="18"/>
     </issue>
 
@@ -10634,7 +10634,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1985"
+            line="1986"
             column="25"/>
     </issue>
 
@@ -10645,7 +10645,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2019"
+            line="2020"
             column="25"/>
     </issue>
 
@@ -10656,7 +10656,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2326"
+            line="2327"
             column="18"/>
     </issue>
 
@@ -10667,7 +10667,7 @@
         errorLine2="                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2337"
+            line="2338"
             column="25"/>
     </issue>
 
@@ -10678,7 +10678,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2347"
+            line="2348"
             column="18"/>
     </issue>
 
@@ -10689,7 +10689,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2358"
+            line="2359"
             column="25"/>
     </issue>
 
@@ -10700,7 +10700,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2372"
+            line="2373"
             column="18"/>
     </issue>
 
@@ -10711,7 +10711,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2394"
+            line="2395"
             column="25"/>
     </issue>
 
@@ -10722,7 +10722,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2407"
+            line="2408"
             column="25"/>
     </issue>
 
@@ -10733,7 +10733,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2418"
+            line="2419"
             column="18"/>
     </issue>
 
@@ -10744,7 +10744,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2420"
+            line="2421"
             column="18"/>
     </issue>
 
@@ -10755,7 +10755,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2463"
+            line="2464"
             column="22"/>
     </issue>
 
@@ -10766,7 +10766,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2503"
+            line="2504"
             column="19"/>
     </issue>
 
@@ -10777,7 +10777,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2507"
+            line="2508"
             column="15"/>
     </issue>
 
@@ -10788,7 +10788,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2537"
+            line="2538"
             column="44"/>
     </issue>
 
@@ -10799,7 +10799,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2565"
+            line="2566"
             column="50"/>
     </issue>
 
@@ -10810,7 +10810,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2589"
+            line="2590"
             column="18"/>
     </issue>
 
@@ -10821,7 +10821,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2604"
+            line="2605"
             column="25"/>
     </issue>
 
@@ -10832,7 +10832,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2691"
+            line="2692"
             column="25"/>
     </issue>
 
@@ -10843,7 +10843,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2704"
+            line="2705"
             column="25"/>
     </issue>
 
@@ -10854,7 +10854,7 @@
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2717"
+            line="2718"
             column="18"/>
     </issue>
 
@@ -10865,7 +10865,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2731"
+            line="2732"
             column="25"/>
     </issue>
 
@@ -10876,7 +10876,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2747"
+            line="2748"
             column="18"/>
     </issue>
 
@@ -10887,7 +10887,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2753"
+            line="2754"
             column="41"/>
     </issue>
 
@@ -10898,7 +10898,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2754"
+            line="2755"
             column="34"/>
     </issue>
 
@@ -10909,7 +10909,7 @@
         errorLine2="                         ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2759"
+            line="2760"
             column="26"/>
     </issue>
 
@@ -10920,7 +10920,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2776"
+            line="2777"
             column="25"/>
     </issue>
 
@@ -10931,7 +10931,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2794"
+            line="2795"
             column="18"/>
     </issue>
 
@@ -10942,7 +10942,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2800"
+            line="2801"
             column="41"/>
     </issue>
 
@@ -10953,7 +10953,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2801"
+            line="2802"
             column="34"/>
     </issue>
 
@@ -10964,7 +10964,7 @@
         errorLine2="                         ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2806"
+            line="2807"
             column="26"/>
     </issue>
 
@@ -10975,7 +10975,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2832"
+            line="2833"
             column="18"/>
     </issue>
 
@@ -10986,7 +10986,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2855"
+            line="2856"
             column="25"/>
     </issue>
 
@@ -10997,7 +10997,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2877"
+            line="2878"
             column="25"/>
     </issue>
 
@@ -11008,7 +11008,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2896"
+            line="2897"
             column="18"/>
     </issue>
 
@@ -11019,7 +11019,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2913"
+            line="2914"
             column="25"/>
     </issue>
 
@@ -11030,7 +11030,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2942"
+            line="2943"
             column="25"/>
     </issue>
 
@@ -11041,7 +11041,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2973"
+            line="2974"
             column="25"/>
     </issue>
 
@@ -11052,7 +11052,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3197"
+            line="3198"
             column="25"/>
     </issue>
 
@@ -11063,7 +11063,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3240"
+            line="3241"
             column="25"/>
     </issue>
 
@@ -11074,7 +11074,7 @@
         errorLine2="                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3262"
+            line="3263"
             column="25"/>
     </issue>
 
@@ -11085,7 +11085,7 @@
         errorLine2="                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3273"
+            line="3274"
             column="25"/>
     </issue>
 
@@ -11096,7 +11096,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3290"
+            line="3291"
             column="25"/>
     </issue>
 
@@ -11107,7 +11107,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3304"
+            line="3305"
             column="25"/>
     </issue>
 
@@ -11118,7 +11118,7 @@
         errorLine2="                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3323"
+            line="3324"
             column="18"/>
     </issue>
 
@@ -11129,7 +11129,7 @@
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3442"
+            line="3443"
             column="18"/>
     </issue>
 
@@ -11140,7 +11140,7 @@
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3457"
+            line="3458"
             column="25"/>
     </issue>
 
@@ -11151,7 +11151,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3467"
+            line="3468"
             column="25"/>
     </issue>
 
@@ -11162,7 +11162,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3479"
+            line="3480"
             column="25"/>
     </issue>
 
@@ -11173,7 +11173,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3497"
+            line="3498"
             column="18"/>
     </issue>
 
@@ -11184,7 +11184,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3531"
+            line="3532"
             column="18"/>
     </issue>
 
@@ -11195,7 +11195,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3549"
+            line="3550"
             column="25"/>
     </issue>
 
@@ -11206,7 +11206,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3560"
+            line="3561"
             column="18"/>
     </issue>
 
@@ -11217,7 +11217,7 @@
         errorLine2="                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3579"
+            line="3580"
             column="25"/>
     </issue>
 
@@ -11228,7 +11228,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3599"
+            line="3600"
             column="18"/>
     </issue>
 
@@ -11239,7 +11239,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3609"
+            line="3610"
             column="22"/>
     </issue>
 
@@ -11250,7 +11250,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3620"
+            line="3621"
             column="15"/>
     </issue>
 
@@ -11261,7 +11261,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3629"
+            line="3630"
             column="15"/>
     </issue>
 
@@ -11272,7 +11272,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3641"
+            line="3642"
             column="25"/>
     </issue>
 
@@ -11283,7 +11283,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3655"
+            line="3656"
             column="18"/>
     </issue>
 
@@ -11294,7 +11294,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3667"
+            line="3668"
             column="25"/>
     </issue>
 
@@ -11305,7 +11305,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3681"
+            line="3682"
             column="18"/>
     </issue>
 
@@ -11316,7 +11316,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3696"
+            line="3697"
             column="25"/>
     </issue>
 
@@ -11327,7 +11327,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3715"
+            line="3716"
             column="18"/>
     </issue>
 
@@ -11338,7 +11338,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3733"
+            line="3734"
             column="25"/>
     </issue>
 
@@ -11349,7 +11349,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3749"
+            line="3750"
             column="18"/>
     </issue>
 
@@ -11360,7 +11360,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3763"
+            line="3764"
             column="25"/>
     </issue>
 
@@ -11371,7 +11371,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3785"
+            line="3786"
             column="25"/>
     </issue>
 
@@ -11382,7 +11382,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3798"
+            line="3799"
             column="25"/>
     </issue>
 
@@ -11393,7 +11393,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3990"
+            line="3996"
             column="29"/>
     </issue>
 
@@ -11404,7 +11404,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3996"
+            line="4002"
             column="22"/>
     </issue>
 
@@ -11415,7 +11415,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4062"
+            line="4068"
             column="29"/>
     </issue>
 
@@ -11426,7 +11426,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4068"
+            line="4074"
             column="22"/>
     </issue>
 
@@ -11437,7 +11437,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4142"
+            line="4148"
             column="29"/>
     </issue>
 
@@ -11448,7 +11448,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4148"
+            line="4154"
             column="22"/>
     </issue>
 
@@ -11459,7 +11459,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4243"
+            line="4249"
             column="19"/>
     </issue>
 
@@ -11470,7 +11470,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4253"
+            line="4259"
             column="19"/>
     </issue>
 
@@ -11481,7 +11481,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4260"
+            line="4266"
             column="34"/>
     </issue>
 
@@ -11492,7 +11492,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4320"
+            line="4326"
             column="22"/>
     </issue>
 
@@ -11503,7 +11503,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4351"
+            line="4357"
             column="40"/>
     </issue>
 
@@ -11811,7 +11811,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/WindowInsetsCompat.java"
-            line="177"
+            line="170"
             column="34"/>
     </issue>
 
@@ -12052,7 +12052,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1069"
+            line="1070"
             column="13"/>
     </issue>
 
@@ -16925,7 +16925,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="813"
+            line="827"
             column="16"/>
     </issue>
 
@@ -16936,7 +16936,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="817"
+            line="831"
             column="16"/>
     </issue>
 
@@ -16947,7 +16947,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="878"
+            line="892"
             column="16"/>
     </issue>
 
@@ -16958,7 +16958,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2342"
+            line="2356"
             column="16"/>
     </issue>
 
@@ -16969,7 +16969,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2350"
+            line="2364"
             column="16"/>
     </issue>
 
@@ -16980,7 +16980,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2358"
+            line="2372"
             column="16"/>
     </issue>
 
@@ -16991,7 +16991,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2416"
+            line="2430"
             column="19"/>
     </issue>
 
@@ -17002,7 +17002,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2453"
+            line="2476"
             column="27"/>
     </issue>
 
@@ -17013,7 +17013,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2469"
+            line="2492"
             column="16"/>
     </issue>
 
@@ -17024,7 +17024,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2469"
+            line="2492"
             column="44"/>
     </issue>
 
@@ -17035,7 +17035,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2477"
+            line="2500"
             column="16"/>
     </issue>
 
@@ -17046,7 +17046,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2477"
+            line="2500"
             column="47"/>
     </issue>
 
@@ -17057,7 +17057,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2485"
+            line="2508"
             column="16"/>
     </issue>
 
@@ -17068,29 +17068,18 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2485"
+            line="2508"
             column="51"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void addCompatExtras(Bundle extras) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2493"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public Bitmap createColoredBitmap(int iconId, int color) {"
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2773"
+            line="2811"
             column="16"/>
     </issue>
 
@@ -17101,7 +17090,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2823"
+            line="2861"
             column="42"/>
     </issue>
 
@@ -17112,7 +17101,7 @@
         errorLine2="                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2824"
+            line="2862"
             column="17"/>
     </issue>
 
@@ -17123,51 +17112,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2935"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void addCompatExtras(Bundle extras) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2955"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(NotificationBuilderWithBuilderAccessor builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3055"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void addCompatExtras(Bundle extras) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3072"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(NotificationBuilderWithBuilderAccessor builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3381"
+            line="2986"
             column="27"/>
     </issue>
 
@@ -17178,29 +17123,40 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3928"
+            line="3119"
             column="27"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void addCompatExtras(Bundle extras) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3947"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public void apply(NotificationBuilderWithBuilderAccessor builder) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4028"
+            line="3458"
+            column="27"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        public void apply(NotificationBuilderWithBuilderAccessor builder) {"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/app/NotificationCompat.java"
+            line="4018"
+            column="27"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        public void apply(NotificationBuilderWithBuilderAccessor builder) {"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/app/NotificationCompat.java"
+            line="4131"
             column="27"/>
     </issue>
 
@@ -17211,7 +17167,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4039"
+            line="4142"
             column="16"/>
     </issue>
 
@@ -17222,7 +17178,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4039"
+            line="4142"
             column="44"/>
     </issue>
 
@@ -17233,7 +17189,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4056"
+            line="4159"
             column="16"/>
     </issue>
 
@@ -17244,7 +17200,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4056"
+            line="4159"
             column="47"/>
     </issue>
 
@@ -17255,7 +17211,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4077"
+            line="4180"
             column="16"/>
     </issue>
 
@@ -17266,7 +17222,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4077"
+            line="4180"
             column="51"/>
     </issue>
 
@@ -17277,7 +17233,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4261"
+            line="4364"
             column="16"/>
     </issue>
 
@@ -17288,7 +17244,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4266"
+            line="4369"
             column="16"/>
     </issue>
 
@@ -19862,7 +19818,7 @@
         errorLine2="                                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="529"
+            line="530"
             column="49"/>
     </issue>
 
@@ -19873,7 +19829,7 @@
         errorLine2="                                              ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="543"
+            line="544"
             column="47"/>
     </issue>
 
@@ -19884,7 +19840,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="560"
+            line="561"
             column="41"/>
     </issue>
 
@@ -19895,7 +19851,7 @@
         errorLine2="                                         ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="580"
+            line="581"
             column="42"/>
     </issue>
 
@@ -19906,7 +19862,7 @@
         errorLine2="                                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="620"
+            line="621"
             column="53"/>
     </issue>
 
@@ -19917,7 +19873,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="620"
+            line="621"
             column="61"/>
     </issue>
 
@@ -19928,7 +19884,7 @@
         errorLine2="                                                      ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="652"
+            line="653"
             column="55"/>
     </issue>
 
@@ -19939,7 +19895,7 @@
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="652"
+            line="653"
             column="63"/>
     </issue>
 
@@ -19950,7 +19906,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="684"
+            line="685"
             column="13"/>
     </issue>
 
@@ -19961,7 +19917,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="714"
+            line="715"
             column="30"/>
     </issue>
 
@@ -19972,7 +19928,7 @@
         errorLine2="                                                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1047"
+            line="1048"
             column="60"/>
     </issue>
 
@@ -19983,7 +19939,7 @@
         errorLine2="                                                                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1068"
+            line="1069"
             column="67"/>
     </issue>
 
@@ -19994,7 +19950,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1191"
+            line="1192"
             column="13"/>
     </issue>
 
@@ -20005,7 +19961,7 @@
         errorLine2="                                                            ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1397"
+            line="1398"
             column="61"/>
     </issue>
 
@@ -20016,7 +19972,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1426"
+            line="1427"
             column="19"/>
     </issue>
 
@@ -20027,7 +19983,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1446"
+            line="1447"
             column="34"/>
     </issue>
 
@@ -20038,7 +19994,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1485"
+            line="1486"
             column="37"/>
     </issue>
 
@@ -20049,7 +20005,7 @@
         errorLine2="                                                                         ~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1485"
+            line="1486"
             column="74"/>
     </issue>
 
@@ -20060,7 +20016,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1509"
+            line="1510"
             column="36"/>
     </issue>
 
@@ -20071,7 +20027,7 @@
         errorLine2="                                                         ~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1571"
+            line="1572"
             column="58"/>
     </issue>
 
@@ -20082,7 +20038,7 @@
         errorLine2="                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1632"
+            line="1633"
             column="19"/>
     </issue>
 
@@ -20093,7 +20049,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1676"
+            line="1677"
             column="36"/>
     </issue>
 
@@ -20104,7 +20060,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1713"
+            line="1714"
             column="48"/>
     </issue>
 
@@ -20115,7 +20071,7 @@
         errorLine2="                                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1730"
+            line="1731"
             column="49"/>
     </issue>
 
@@ -20126,7 +20082,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1744"
+            line="1745"
             column="40"/>
     </issue>
 
@@ -20137,7 +20093,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1936"
+            line="1937"
             column="41"/>
     </issue>
 
@@ -20148,7 +20104,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1950"
+            line="1951"
             column="41"/>
     </issue>
 
@@ -20159,7 +20115,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="1972"
+            line="1973"
             column="36"/>
     </issue>
 
@@ -20170,7 +20126,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2074"
+            line="2075"
             column="40"/>
     </issue>
 
@@ -20181,7 +20137,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2091"
+            line="2092"
             column="40"/>
     </issue>
 
@@ -20192,7 +20148,7 @@
         errorLine2="                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2108"
+            line="2109"
             column="33"/>
     </issue>
 
@@ -20203,7 +20159,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2123"
+            line="2124"
             column="29"/>
     </issue>
 
@@ -20214,7 +20170,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2138"
+            line="2139"
             column="29"/>
     </issue>
 
@@ -20225,7 +20181,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2151"
+            line="2152"
             column="36"/>
     </issue>
 
@@ -20236,7 +20192,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2165"
+            line="2166"
             column="37"/>
     </issue>
 
@@ -20247,7 +20203,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2179"
+            line="2180"
             column="37"/>
     </issue>
 
@@ -20258,7 +20214,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2192"
+            line="2193"
             column="34"/>
     </issue>
 
@@ -20269,7 +20225,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2205"
+            line="2206"
             column="34"/>
     </issue>
 
@@ -20280,7 +20236,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2216"
+            line="2217"
             column="35"/>
     </issue>
 
@@ -20291,7 +20247,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2232"
+            line="2233"
             column="34"/>
     </issue>
 
@@ -20302,7 +20258,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2245"
+            line="2246"
             column="35"/>
     </issue>
 
@@ -20313,7 +20269,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2261"
+            line="2262"
             column="34"/>
     </issue>
 
@@ -20324,7 +20280,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2269"
+            line="2270"
             column="37"/>
     </issue>
 
@@ -20335,7 +20291,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2277"
+            line="2278"
             column="38"/>
     </issue>
 
@@ -20346,7 +20302,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2285"
+            line="2286"
             column="38"/>
     </issue>
 
@@ -20357,7 +20313,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2293"
+            line="2294"
             column="35"/>
     </issue>
 
@@ -20368,7 +20324,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2301"
+            line="2302"
             column="35"/>
     </issue>
 
@@ -20379,7 +20335,7 @@
         errorLine2="                             ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2309"
+            line="2310"
             column="30"/>
     </issue>
 
@@ -20390,7 +20346,7 @@
         errorLine2="                             ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2317"
+            line="2318"
             column="30"/>
     </issue>
 
@@ -20401,7 +20357,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2370"
+            line="2371"
             column="62"/>
     </issue>
 
@@ -20412,7 +20368,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2436"
+            line="2437"
             column="55"/>
     </issue>
 
@@ -20423,7 +20379,7 @@
         errorLine2="                                            ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2477"
+            line="2478"
             column="45"/>
     </issue>
 
@@ -20434,7 +20390,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2491"
+            line="2492"
             column="52"/>
     </issue>
 
@@ -20445,7 +20401,7 @@
         errorLine2="                                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2655"
+            line="2656"
             column="49"/>
     </issue>
 
@@ -20456,7 +20412,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2671"
+            line="2672"
             column="37"/>
     </issue>
 
@@ -20467,7 +20423,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2729"
+            line="2730"
             column="19"/>
     </issue>
 
@@ -20478,7 +20434,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2745"
+            line="2746"
             column="66"/>
     </issue>
 
@@ -20489,7 +20445,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2774"
+            line="2775"
             column="19"/>
     </issue>
 
@@ -20500,7 +20456,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="2792"
+            line="2793"
             column="66"/>
     </issue>
 
@@ -20511,7 +20467,7 @@
         errorLine2="                                                         ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3440"
+            line="3441"
             column="58"/>
     </issue>
 
@@ -20522,7 +20478,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3558"
+            line="3559"
             column="59"/>
     </issue>
 
@@ -20533,7 +20489,7 @@
         errorLine2="                                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3606"
+            line="3607"
             column="61"/>
     </issue>
 
@@ -20544,7 +20500,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3607"
+            line="3608"
             column="13"/>
     </issue>
 
@@ -20555,7 +20511,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3607"
+            line="3608"
             column="51"/>
     </issue>
 
@@ -20566,7 +20522,7 @@
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3627"
+            line="3628"
             column="58"/>
     </issue>
 
@@ -20577,7 +20533,7 @@
         errorLine2="                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3730"
+            line="3731"
             column="19"/>
     </issue>
 
@@ -20588,7 +20544,7 @@
         errorLine2="                                                                           ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3730"
+            line="3731"
             column="76"/>
     </issue>
 
@@ -20599,7 +20555,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3923"
+            line="3929"
             column="37"/>
     </issue>
 
@@ -20610,7 +20566,7 @@
         errorLine2="                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3923"
+            line="3929"
             column="45"/>
     </issue>
 
@@ -20621,7 +20577,7 @@
         errorLine2="                                                ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3959"
+            line="3965"
             column="49"/>
     </issue>
 
@@ -20632,7 +20588,7 @@
         errorLine2="                                                  ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="3978"
+            line="3984"
             column="51"/>
     </issue>
 
@@ -20643,7 +20599,7 @@
         errorLine2="                                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4025"
+            line="4031"
             column="50"/>
     </issue>
 
@@ -20654,7 +20610,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4025"
+            line="4031"
             column="61"/>
     </issue>
 
@@ -20665,7 +20621,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4051"
+            line="4057"
             column="19"/>
     </issue>
 
@@ -20676,7 +20632,7 @@
         errorLine2="                                                         ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4051"
+            line="4057"
             column="58"/>
     </issue>
 
@@ -20687,7 +20643,7 @@
         errorLine2="                                                 ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4114"
+            line="4120"
             column="50"/>
     </issue>
 
@@ -20698,7 +20654,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewCompat.java"
-            line="4131"
+            line="4137"
             column="48"/>
     </issue>
 
diff --git a/emoji/core/lint-baseline.xml b/emoji/core/lint-baseline.xml
index 6b81f8c..9dbfa8e 100644
--- a/emoji/core/lint-baseline.xml
+++ b/emoji/core/lint-baseline.xml
@@ -4,12 +4,12 @@
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="    /**"
-        errorLine2="    ^">
+        errorLine1="    private static final class CodepointIndexFinder {"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/emoji/text/EmojiProcessor.java"
-            line="662"
-            column="5"/>
+            line="665"
+            column="32"/>
     </issue>
 
     <issue
diff --git a/fragment/integration-tests/testapp/lint-baseline.xml b/fragment/integration-tests/testapp/lint-baseline.xml
index 272b84f..dc789257 100644
--- a/fragment/integration-tests/testapp/lint-baseline.xml
+++ b/fragment/integration-tests/testapp/lint-baseline.xml
@@ -2,6 +2,17 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(Build.VERSION_CODES.LOLLIPOP)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/fragment/testapp/kittenfragmenttransitions/DetailsTransition.kt"
+            line="31"
+            column="1"/>
+    </issue>
+
+    <issue
         id="UnusedResources"
         message="The resource `R.color.colorPrimary` appears to be unused"
         errorLine1="    &lt;color name=&quot;colorPrimary&quot;>#3F51B5&lt;/color>"
diff --git a/leanback/leanback/lint-baseline.xml b/leanback/leanback/lint-baseline.xml
index 4e4b515..be6f1ed 100644
--- a/leanback/leanback/lint-baseline.xml
+++ b/leanback/leanback/lint-baseline.xml
@@ -4,12 +4,12 @@
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public class FocusHighlightHelper {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FocusHighlightHelper.java"
-            line="36"
-            column="1"/>
+            line="39"
+            column="14"/>
     </issue>
 
     <issue
diff --git a/lifecycle/lifecycle-extensions/lint-baseline.xml b/lifecycle/lifecycle-extensions/lint-baseline.xml
index 614e7da..d5b1c0f 100644
--- a/lifecycle/lifecycle-extensions/lint-baseline.xml
+++ b/lifecycle/lifecycle-extensions/lint-baseline.xml
@@ -4,12 +4,12 @@
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public class ViewModelProviders {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/ViewModelProviders.java"
-            line="28"
-            column="1"/>
+            line="34"
+            column="14"/>
     </issue>
 
 </issues>
diff --git a/lifecycle/lifecycle-livedata-ktx/lint-baseline.xml b/lifecycle/lifecycle-livedata-ktx/lint-baseline.xml
index fc93235..bc06ad2 100644
--- a/lifecycle/lifecycle-livedata-ktx/lint-baseline.xml
+++ b/lifecycle/lifecycle-livedata-ktx/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                                                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/CoroutineLiveData.kt"
-            line="458"
+            line="470"
             column="53"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                             ~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/FlowLiveData.kt"
-            line="138"
+            line="148"
             column="46"/>
     </issue>
 
diff --git a/lint-checks/src/main/java/androidx/build/lint/BanTargetApiAnnotation.kt b/lint-checks/src/main/java/androidx/build/lint/BanTargetApiAnnotation.kt
index 56d6ac7..106e0fb 100644
--- a/lint-checks/src/main/java/androidx/build/lint/BanTargetApiAnnotation.kt
+++ b/lint-checks/src/main/java/androidx/build/lint/BanTargetApiAnnotation.kt
@@ -16,7 +16,7 @@
 
 package androidx.build.lint
 
-import com.android.tools.lint.detector.api.AnnotationUsageType
+import com.android.tools.lint.client.api.UElementHandler
 
 import com.android.tools.lint.detector.api.Category
 import com.android.tools.lint.detector.api.Detector
@@ -25,32 +25,22 @@
 import com.android.tools.lint.detector.api.JavaContext
 import com.android.tools.lint.detector.api.Scope
 import com.android.tools.lint.detector.api.Severity
-import com.intellij.psi.PsiMethod
 import org.jetbrains.uast.UAnnotation
-import org.jetbrains.uast.UElement
-import java.util.Collections
 
 class BanTargetApiAnnotation : Detector(), Detector.UastScanner {
 
-    override fun applicableAnnotations(): List<String>? {
-        return Collections.singletonList("android.annotation.TargetApi")
+    override fun getApplicableUastTypes() = listOf(UAnnotation::class.java)
+
+    override fun createUastHandler(context: JavaContext): UElementHandler? {
+        return AnnotationChecker(context)
     }
 
-    override fun visitAnnotationUsage(
-        context: JavaContext,
-        usage: UElement,
-        type: AnnotationUsageType,
-        annotation: UAnnotation,
-        qualifiedName: String,
-        method: PsiMethod?,
-        annotations: List<UAnnotation>,
-        allMemberAnnotations: List<UAnnotation>,
-        allClassAnnotations: List<UAnnotation>,
-        allPackageAnnotations: List<UAnnotation>
-    ) {
-        if (type == AnnotationUsageType.METHOD_CALL) {
-            context.report(ISSUE, annotation, context.getNameLocation(annotation),
+    private inner class AnnotationChecker(val context: JavaContext) : UElementHandler() {
+        override fun visitAnnotation(node: UAnnotation) {
+            if (node.qualifiedName == "android.annotation.TargetApi") {
+                context.report(ISSUE, node, context.getNameLocation(node),
                     "Uses @TargetApi annotation")
+            }
         }
     }
 
diff --git a/media2/player/build.gradle b/media2/player/build.gradle
index 6c010b4..465db9a 100644
--- a/media2/player/build.gradle
+++ b/media2/player/build.gradle
@@ -1,4 +1,4 @@
-/*
+    /*
  * Copyright 2018 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,7 +48,7 @@
     lintOptions {
         // Lint bug causes the BanTargetApiAnnotation lint check to crash in this project.
         // remove when b/120615476 is fixed.
-        disable("BanTargetApiAnnotation")
+        // disable("BanTargetApiAnnotation")
     }
     defaultConfig {
         minSdkVersion 16
diff --git a/media2/session/lint-baseline.xml b/media2/session/lint-baseline.xml
index f1a68a7..215b137 100644
--- a/media2/session/lint-baseline.xml
+++ b/media2/session/lint-baseline.xml
@@ -63,7 +63,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaSessionImplBase.java"
-            line="219"
+            line="222"
             column="52"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaSessionImplBase.java"
-            line="314"
+            line="317"
             column="62"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaSessionImplBase.java"
-            line="378"
+            line="382"
             column="36"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaController.java"
-            line="1311"
+            line="1313"
             column="29"/>
     </issue>
 
@@ -327,7 +327,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="421"
+            line="437"
             column="19"/>
     </issue>
 
@@ -338,7 +338,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="422"
+            line="438"
             column="13"/>
     </issue>
 
@@ -349,7 +349,7 @@
         errorLine2="                                         ~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="442"
+            line="458"
             column="42"/>
     </issue>
 
@@ -360,7 +360,7 @@
         errorLine2="                                                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="442"
+            line="458"
             column="75"/>
     </issue>
 
@@ -371,7 +371,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="537"
+            line="553"
             column="19"/>
     </issue>
 
@@ -382,7 +382,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="537"
+            line="553"
             column="56"/>
     </issue>
 
@@ -393,7 +393,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="554"
+            line="570"
             column="19"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="                                                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="554"
+            line="570"
             column="68"/>
     </issue>
 
@@ -415,7 +415,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="589"
+            line="605"
             column="19"/>
     </issue>
 
@@ -426,7 +426,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="589"
+            line="605"
             column="42"/>
     </issue>
 
@@ -437,7 +437,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="625"
+            line="641"
             column="19"/>
     </issue>
 
@@ -448,7 +448,7 @@
         errorLine2="                                                     ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="625"
+            line="641"
             column="54"/>
     </issue>
 
@@ -459,7 +459,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="655"
+            line="671"
             column="19"/>
     </issue>
 
@@ -470,7 +470,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="656"
+            line="672"
             column="13"/>
     </issue>
 
@@ -481,7 +481,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="671"
+            line="687"
             column="19"/>
     </issue>
 
@@ -492,7 +492,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="672"
+            line="688"
             column="13"/>
     </issue>
 
@@ -503,7 +503,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="713"
+            line="729"
             column="44"/>
     </issue>
 
@@ -514,7 +514,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="757"
+            line="773"
             column="19"/>
     </issue>
 
@@ -525,7 +525,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="758"
+            line="774"
             column="13"/>
     </issue>
 
@@ -536,7 +536,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="768"
+            line="784"
             column="48"/>
     </issue>
 
@@ -547,7 +547,7 @@
         errorLine2="                                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="784"
+            line="800"
             column="58"/>
     </issue>
 
diff --git a/media2/widget/lint-baseline.xml b/media2/widget/lint-baseline.xml
index 98c2254..a844da6 100644
--- a/media2/widget/lint-baseline.xml
+++ b/media2/widget/lint-baseline.xml
@@ -60,11 +60,11 @@
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
         errorLine1="    static class MediaFormatUtil {"
-        errorLine2="    ^">
+        errorLine2="                 ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/widget/SubtitleController.java"
             line="275"
-            column="5"/>
+            column="18"/>
     </issue>
 
     <issue
diff --git a/room/runtime/lint-baseline.xml b/room/runtime/lint-baseline.xml
index 1053fb9..31b6be0 100644
--- a/room/runtime/lint-baseline.xml
+++ b/room/runtime/lint-baseline.xml
@@ -59,12 +59,12 @@
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public class Room {"
+        errorLine2="             ~~~~">
         <location
             file="src/main/java/androidx/room/Room.java"
-            line="23"
-            column="1"/>
+            line="27"
+            column="14"/>
     </issue>
 
     <issue
@@ -646,7 +646,7 @@
         errorLine2="                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="319"
+            line="322"
             column="33"/>
     </issue>
 
@@ -657,7 +657,7 @@
         errorLine2="                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="469"
+            line="475"
             column="45"/>
     </issue>
 
@@ -668,7 +668,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="558"
+            line="564"
             column="16"/>
     </issue>
 
@@ -679,7 +679,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="558"
+            line="564"
             column="43"/>
     </issue>
 
@@ -690,7 +690,7 @@
         errorLine2="                                                               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="558"
+            line="564"
             column="64"/>
     </issue>
 
@@ -701,7 +701,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="578"
+            line="584"
             column="16"/>
     </issue>
 
@@ -712,7 +712,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="578"
+            line="584"
             column="43"/>
     </issue>
 
@@ -723,7 +723,7 @@
         errorLine2="            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="579"
+            line="585"
             column="13"/>
     </issue>
 
@@ -734,7 +734,7 @@
         errorLine2="                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="687"
+            line="693"
             column="56"/>
     </issue>
 
diff --git a/room/rxjava2/lint-baseline.xml b/room/rxjava2/lint-baseline.xml
index a5de48f..fa4a807 100644
--- a/room/rxjava2/lint-baseline.xml
+++ b/room/rxjava2/lint-baseline.xml
@@ -4,12 +4,12 @@
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/**"
-        errorLine2="^">
+        errorLine1="public class RxRoom {"
+        errorLine2="             ~~~~~~">
         <location
             file="src/main/java/androidx/room/RxRoom.java"
-            line="43"
-            column="1"/>
+            line="47"
+            column="14"/>
     </issue>
 
     <issue
diff --git a/samples/Support7Demos/lint-baseline.xml b/samples/Support7Demos/lint-baseline.xml
index 2b289cd..40caf3d 100644
--- a/samples/Support7Demos/lint-baseline.xml
+++ b/samples/Support7Demos/lint-baseline.xml
@@ -636,11 +636,11 @@
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
         errorLine1="    private static final class ICSMediaPlayer {"
-        errorLine2="    ^">
+        errorLine2="                               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
             line="378"
-            column="5"/>
+            column="32"/>
     </issue>
 
     <issue
@@ -1064,7 +1064,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="108"
+            line="109"
             column="13"/>
     </issue>
 
@@ -1075,7 +1075,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="115"
+            line="116"
             column="13"/>
     </issue>
 
@@ -1086,7 +1086,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="116"
+            line="117"
             column="13"/>
     </issue>
 
@@ -1097,7 +1097,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="117"
+            line="118"
             column="13"/>
     </issue>
 
@@ -1108,7 +1108,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="118"
+            line="119"
             column="13"/>
     </issue>
 
@@ -1119,7 +1119,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="129"
+            line="130"
             column="13"/>
     </issue>
 
@@ -1130,7 +1130,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="131"
+            line="132"
             column="13"/>
     </issue>
 
diff --git a/samples/SupportSliceDemos/lint-baseline.xml b/samples/SupportSliceDemos/lint-baseline.xml
index 835925a..f202534 100644
--- a/samples/SupportSliceDemos/lint-baseline.xml
+++ b/samples/SupportSliceDemos/lint-baseline.xml
@@ -85,7 +85,7 @@
         errorLine2="                                               ~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="124"
+            line="127"
             column="48"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                ~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="124"
+            line="127"
             column="17"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                               ~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="130"
+            line="133"
             column="48"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                ~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="130"
+            line="133"
             column="17"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                ~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="137"
+            line="140"
             column="17"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                ~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="138"
+            line="141"
             column="17"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="144"
+            line="147"
             column="17"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="82"
+            line="84"
             column="27"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="95"
+            line="97"
             column="57"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="131"
+            line="133"
             column="25"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="101"
+            line="104"
             column="26"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="175"
+            line="180"
             column="40"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="                                         ~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="196"
+            line="201"
             column="42"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="283"
+            line="288"
             column="40"/>
     </issue>
 
@@ -239,7 +239,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="78"
+            line="80"
             column="31"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="78"
+            line="80"
             column="48"/>
     </issue>
 
@@ -261,7 +261,7 @@
         errorLine2="                     ~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="233"
+            line="235"
             column="22"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                                            ~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="233"
+            line="235"
             column="45"/>
     </issue>
 
@@ -283,7 +283,7 @@
         errorLine2="                                                             ~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="233"
+            line="235"
             column="62"/>
     </issue>
 
@@ -294,7 +294,7 @@
         errorLine2="            ~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="234"
+            line="236"
             column="13"/>
     </issue>
 
@@ -305,7 +305,7 @@
         errorLine2="                     ~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="255"
+            line="257"
             column="22"/>
     </issue>
 
@@ -316,7 +316,7 @@
         errorLine2="                                                ~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="255"
+            line="257"
             column="49"/>
     </issue>
 
@@ -327,7 +327,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="255"
+            line="257"
             column="66"/>
     </issue>
 
@@ -338,7 +338,7 @@
         errorLine2="            ~~~">
         <location
             file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="256"
+            line="258"
             column="13"/>
     </issue>
 
diff --git a/slices/builders/lint-baseline.xml b/slices/builders/lint-baseline.xml
index b327d7a2..dc0fa05 100644
--- a/slices/builders/lint-baseline.xml
+++ b/slices/builders/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="227"
+            line="232"
             column="45"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="281"
+            line="295"
             column="45"/>
     </issue>
 
@@ -147,17 +147,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void apply(Slice.Builder builder) {"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="80"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void addCell(CellBuilder builder) {"
         errorLine2="                        ~~~~~~~~~~~">
         <location
@@ -213,495 +202,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(Slice.Builder b) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="233"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void addRow(RowBuilder impl);"
-        errorLine2="                ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="48"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void addGridRow(GridRowBuilder impl);"
-        errorLine2="                    ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="52"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void setHeader(HeaderBuilder impl);"
-        errorLine2="                   ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="60"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void addAction(SliceAction action);"
-        errorLine2="                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="66"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void addInputRange(InputRangeBuilder builder);"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="71"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void addRange(RangeBuilder builder);"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="76"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void addSelection(SelectionBuilder builder);"
-        errorLine2="                      ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="81"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void setSeeMoreRow(RowBuilder builder);"
-        errorLine2="                       ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="92"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void setSeeMoreAction(PendingIntent intent);"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="103"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void setKeywords(Set&lt;String> keywords);"
-        errorLine2="                     ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilder.java"
-            line="113"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ListBuilder setKeywords(Set&lt;String> keywords) {"
-        errorLine2="                                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="368"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected TemplateBuilderImpl selectImpl() {"
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="467"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public androidx.slice.builders.impl.ListBuilder getImpl() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="482"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public IconCompat getTitleIcon() {"
-        errorLine2="               ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="703"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getTitle() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="735"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getSubtitle() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="743"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public SliceAction getPrimaryAction() {"
-        errorLine2="               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="751"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getContentDescription() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="759"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public IconCompat getTitleIcon() {"
-        errorLine2="               ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1027"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public List&lt;Object> getEndItems() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1041"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public List&lt;Integer> getEndTypes() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1049"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public List&lt;Boolean> getEndLoads() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1057"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getTitle() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1097"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getSubtitle() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1105"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public PendingIntent getAction() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1113"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public PendingIntent getInputAction() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1121"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public IconCompat getThumb() {"
-        errorLine2="               ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1129"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public SliceAction getPrimaryAction() {"
-        errorLine2="               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1137"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getContentDescription() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1145"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public RowBuilder(Uri uri) {"
-        errorLine2="                          ~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1242"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public RowBuilder setTitleItem(@NonNull IconCompat icon, @ImageMode int imageMode) {"
-        errorLine2="               ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1275"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Uri getUri() {"
-        errorLine2="               ~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1524"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public IconCompat getTitleIcon() {"
-        errorLine2="               ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1588"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public SliceAction getTitleAction() {"
-        errorLine2="               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1596"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public SliceAction getPrimaryAction() {"
-        errorLine2="               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1604"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getTitle() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1612"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getSubtitle() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1628"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getContentDescription() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1644"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public List&lt;Object> getEndItems() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1660"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public List&lt;Integer> getEndTypes() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1668"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public List&lt;Boolean> getEndLoads() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1676"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public HeaderBuilder(Uri uri) {"
-        errorLine2="                             ~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1736"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Uri getUri() {"
-        errorLine2="               ~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/ListBuilder.java"
-            line="1860"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public ListBuilderBasicImpl(Slice.Builder b, SliceSpec spec) {"
         errorLine2="                                ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="69"
+            line="74"
             column="33"/>
     </issue>
 
@@ -712,381 +217,18 @@
         errorLine2="                                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="69"
+            line="74"
             column="50"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addRow(RowBuilder builder) {"
-        errorLine2="                       ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="76"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addGridRow(GridRowBuilder builder) {"
-        errorLine2="                           ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="97"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addAction(SliceAction action) {"
-        errorLine2="                          ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="127"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setHeader(HeaderBuilder builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="134"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addInputRange(InputRangeBuilder builder) {"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="147"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addRange(RangeBuilder builder) {"
-        errorLine2="                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="163"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addSelection(SelectionBuilder builder) {"
-        errorLine2="                             ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="176"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setSeeMoreRow(RowBuilder builder) {"
-        errorLine2="                              ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="191"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setSeeMoreAction(PendingIntent intent) {"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="198"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setKeywords(Set&lt;String> keywords) {"
-        errorLine2="                            ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="212"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void apply(Slice.Builder builder) {"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="243"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ListBuilderImpl(Slice.Builder b, SliceSpec spec) {"
-        errorLine2="                           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="92"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ListBuilderImpl(Slice.Builder b, SliceSpec spec) {"
-        errorLine2="                                            ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="92"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ListBuilderImpl(Slice.Builder b, SliceSpec spec, Clock clock) {"
-        errorLine2="                           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="98"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ListBuilderImpl(Slice.Builder b, SliceSpec spec, Clock clock) {"
-        errorLine2="                                            ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="98"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ListBuilderImpl(Slice.Builder b, SliceSpec spec, Clock clock) {"
-        errorLine2="                                                            ~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="98"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void apply(Slice.Builder builder) {"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="105"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Slice build() {"
-        errorLine2="           ~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="133"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addInputRange(InputRangeBuilder builder) {"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="209"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addRange(RangeBuilder builder) {"
-        errorLine2="                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="216"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addSelection(SelectionBuilder builder) {"
-        errorLine2="                             ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="223"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setSeeMoreRow(RowBuilder builder) {"
-        errorLine2="                              ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="237"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setSeeMoreAction(PendingIntent intent) {"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="247"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        protected CharSequence mTitle;"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="314"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        protected CharSequence mSubtitle;"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="315"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        protected CharSequence mContentDescr;"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="316"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        protected SliceAction mPrimaryAction;"
-        errorLine2="                  ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="317"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(Slice.Builder builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="351"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(Slice.Builder builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="446"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        protected void setTitleItem(IconCompat icon, int imageMode) {"
-        errorLine2="                                    ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="549"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        protected void setSubtitle(CharSequence subtitle) {"
-        errorLine2="                                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="591"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(Slice.Builder b) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="647"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(Slice.Builder b) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="717"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public MessagingBasicImpl(Slice.Builder builder, SliceSpec spec) {"
         errorLine2="                              ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="46"
+            line="47"
             column="31"/>
     </issue>
 
@@ -1097,29 +239,18 @@
         errorLine2="                                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="46"
+            line="47"
             column="54"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void apply(Slice.Builder builder) {"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="53"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void add(TemplateBuilderImpl builder) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="71"
+            line="72"
             column="21"/>
     </issue>
 
@@ -1130,7 +261,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="81"
+            line="82"
             column="12"/>
     </issue>
 
@@ -1141,7 +272,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="97"
+            line="98"
             column="31"/>
     </issue>
 
@@ -1152,7 +283,7 @@
         errorLine2="                              ~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="111"
+            line="112"
             column="31"/>
     </issue>
 
@@ -1163,24 +294,13 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="119"
+            line="120"
             column="29"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(Slice.Builder builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="133"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    void add(TemplateBuilderImpl builder);"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~">
         <location
@@ -1229,7 +349,7 @@
         errorLine2="                               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="42"
+            line="43"
             column="32"/>
     </issue>
 
@@ -1240,7 +360,7 @@
         errorLine2="                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="42"
+            line="43"
             column="49"/>
     </issue>
 
@@ -1251,7 +371,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="51"
+            line="52"
             column="21"/>
     </issue>
 
@@ -1262,29 +382,18 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="59"
+            line="60"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void apply(Slice.Builder builder) {"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="66"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public MessageBuilder(MessagingListV1Impl parent) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="78"
+            line="79"
             column="31"/>
     </issue>
 
@@ -1295,7 +404,7 @@
         errorLine2="                              ~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="91"
+            line="92"
             column="31"/>
     </issue>
 
@@ -1306,24 +415,13 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="98"
+            line="99"
             column="29"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(Slice.Builder builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="112"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public MessagingSliceBuilder add(MessageBuilder builder) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -1471,7 +569,7 @@
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="38"
+            line="39"
             column="28"/>
     </issue>
 
@@ -1482,7 +580,7 @@
         errorLine2="                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="38"
+            line="39"
             column="45"/>
     </issue>
 
@@ -1493,29 +591,18 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="45"
+            line="46"
             column="21"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void apply(Slice.Builder builder) {"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="52"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public TemplateBuilderImpl createMessageBuilder() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="59"
+            line="60"
             column="12"/>
     </issue>
 
@@ -1526,7 +613,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="69"
+            line="70"
             column="31"/>
     </issue>
 
@@ -1537,7 +624,7 @@
         errorLine2="                              ~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="77"
+            line="78"
             column="31"/>
     </issue>
 
@@ -1548,24 +635,13 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="85"
+            line="86"
             column="29"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void apply(Slice.Builder builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="99"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public SelectionBuilder addOption(String optionKey, CharSequence optionText) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
@@ -1779,7 +855,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java"
-            line="37"
+            line="38"
             column="38"/>
     </issue>
 
@@ -1790,29 +866,18 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java"
-            line="38"
+            line="39"
             column="38"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void apply(Slice.Builder sliceBuilder) {"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java"
-            line="43"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public SelectionBuilderImpl(Slice.Builder sliceBuilder,"
         errorLine2="                                ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"
-            line="34"
+            line="35"
             column="33"/>
     </issue>
 
@@ -1823,29 +888,18 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"
-            line="35"
+            line="36"
             column="33"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public abstract void apply(Slice.Builder sliceBuilder);"
-        errorLine2="                               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"
-            line="45"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    protected SelectionBuilder getSelectionBuilder() {"
         errorLine2="              ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"
-            line="47"
+            line="48"
             column="15"/>
     </issue>
 
@@ -1856,7 +910,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java"
-            line="45"
+            line="46"
             column="39"/>
     </issue>
 
@@ -1867,24 +921,13 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java"
-            line="46"
+            line="47"
             column="35"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void apply(Slice.Builder sliceBuilder) {"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java"
-            line="51"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public static SliceAction create(@NonNull PendingIntent action,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
@@ -2072,17 +1115,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public abstract void apply(Slice.Builder builder);"
-        errorLine2="                               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="94"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public Clock getClock() {"
         errorLine2="           ~~~~~">
         <location
diff --git a/slices/core/lint-baseline.xml b/slices/core/lint-baseline.xml
index eb1bc6b..317b481 100644
--- a/slices/core/lint-baseline.xml
+++ b/slices/core/lint-baseline.xml
@@ -63,7 +63,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="638"
+            line="640"
             column="42"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="639"
+            line="641"
             column="18"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="398"
+            line="400"
             column="35"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="168"
+            line="169"
             column="13"/>
     </issue>
 
@@ -349,7 +349,7 @@
         errorLine2="                 ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="184"
+            line="186"
             column="18"/>
     </issue>
 
@@ -360,7 +360,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="203"
+            line="205"
             column="12"/>
     </issue>
 
@@ -371,7 +371,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="231"
+            line="233"
             column="12"/>
     </issue>
 
@@ -382,7 +382,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="238"
+            line="240"
             column="12"/>
     </issue>
 
@@ -393,7 +393,7 @@
         errorLine2="           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="247"
+            line="249"
             column="12"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="                      ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="254"
+            line="256"
             column="23"/>
     </issue>
 
@@ -415,7 +415,7 @@
         errorLine2="                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="262"
+            line="264"
             column="23"/>
     </issue>
 
@@ -426,7 +426,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="270"
+            line="272"
             column="39"/>
     </issue>
 
@@ -437,7 +437,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="338"
+            line="340"
             column="16"/>
     </issue>
 
@@ -448,7 +448,7 @@
         errorLine2="                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="338"
+            line="340"
             column="32"/>
     </issue>
 
@@ -459,7 +459,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="346"
+            line="348"
             column="16"/>
     </issue>
 
@@ -470,7 +470,7 @@
         errorLine2="                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="346"
+            line="348"
             column="44"/>
     </issue>
 
@@ -481,7 +481,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="354"
+            line="356"
             column="16"/>
     </issue>
 
@@ -492,7 +492,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="354"
+            line="356"
             column="44"/>
     </issue>
 
@@ -503,7 +503,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="361"
+            line="363"
             column="16"/>
     </issue>
 
@@ -514,7 +514,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="371"
+            line="373"
             column="16"/>
     </issue>
 
@@ -525,7 +525,7 @@
         errorLine2="                                                         ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="371"
+            line="373"
             column="58"/>
     </issue>
 
@@ -536,7 +536,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="382"
+            line="384"
             column="16"/>
     </issue>
 
@@ -547,7 +547,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="397"
+            line="399"
             column="16"/>
     </issue>
 
@@ -558,7 +558,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="410"
+            line="412"
             column="16"/>
     </issue>
 
@@ -569,7 +569,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="410"
+            line="412"
             column="32"/>
     </issue>
 
@@ -580,7 +580,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="411"
+            line="413"
             column="28"/>
     </issue>
 
@@ -591,7 +591,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="421"
+            line="423"
             column="16"/>
     </issue>
 
@@ -602,7 +602,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="421"
+            line="423"
             column="32"/>
     </issue>
 
@@ -613,7 +613,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="422"
+            line="424"
             column="28"/>
     </issue>
 
@@ -624,7 +624,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="431"
+            line="433"
             column="16"/>
     </issue>
 
@@ -635,7 +635,7 @@
         errorLine2="                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="431"
+            line="433"
             column="32"/>
     </issue>
 
@@ -646,7 +646,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="432"
+            line="434"
             column="28"/>
     </issue>
 
@@ -657,7 +657,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="445"
+            line="447"
             column="16"/>
     </issue>
 
@@ -668,7 +668,7 @@
         errorLine2="                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="445"
+            line="447"
             column="32"/>
     </issue>
 
@@ -679,7 +679,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="446"
+            line="448"
             column="28"/>
     </issue>
 
@@ -690,7 +690,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="461"
+            line="463"
             column="16"/>
     </issue>
 
@@ -701,7 +701,7 @@
         errorLine2="                                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="461"
+            line="463"
             column="45"/>
     </issue>
 
@@ -712,7 +712,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="462"
+            line="464"
             column="28"/>
     </issue>
 
@@ -723,7 +723,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="474"
+            line="476"
             column="16"/>
     </issue>
 
@@ -734,7 +734,7 @@
         errorLine2="                                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="474"
+            line="476"
             column="45"/>
     </issue>
 
@@ -745,7 +745,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="475"
+            line="477"
             column="28"/>
     </issue>
 
@@ -756,7 +756,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="486"
+            line="488"
             column="16"/>
     </issue>
 
@@ -767,7 +767,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="487"
+            line="489"
             column="28"/>
     </issue>
 
@@ -778,7 +778,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="497"
+            line="499"
             column="16"/>
     </issue>
 
@@ -789,7 +789,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="498"
+            line="500"
             column="28"/>
     </issue>
 
@@ -800,7 +800,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="507"
+            line="509"
             column="16"/>
     </issue>
 
@@ -811,7 +811,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="508"
+            line="510"
             column="28"/>
     </issue>
 
@@ -822,7 +822,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="518"
+            line="520"
             column="16"/>
     </issue>
 
@@ -833,7 +833,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="519"
+            line="521"
             column="28"/>
     </issue>
 
@@ -844,7 +844,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="530"
+            line="532"
             column="16"/>
     </issue>
 
@@ -855,7 +855,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="531"
+            line="533"
             column="28"/>
     </issue>
 
@@ -866,7 +866,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="541"
+            line="543"
             column="16"/>
     </issue>
 
@@ -877,7 +877,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="542"
+            line="544"
             column="28"/>
     </issue>
 
@@ -888,7 +888,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="551"
+            line="553"
             column="16"/>
     </issue>
 
@@ -899,7 +899,7 @@
         errorLine2="                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="551"
+            line="553"
             column="38"/>
     </issue>
 
@@ -910,7 +910,7 @@
         errorLine2="               ~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="559"
+            line="561"
             column="16"/>
     </issue>
 
@@ -921,7 +921,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="577"
+            line="579"
             column="12"/>
     </issue>
 
@@ -932,7 +932,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="577"
+            line="579"
             column="28"/>
     </issue>
 
@@ -943,7 +943,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="602"
+            line="604"
             column="36"/>
     </issue>
 
@@ -954,7 +954,7 @@
         errorLine2="                                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="602"
+            line="604"
             column="54"/>
     </issue>
 
@@ -965,7 +965,7 @@
         errorLine2="                                  ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="626"
+            line="628"
             column="35"/>
     </issue>
 
@@ -976,7 +976,7 @@
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="627"
+            line="629"
             column="13"/>
     </issue>
 
@@ -1053,7 +1053,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceConvert.java"
-            line="51"
+            line="53"
             column="19"/>
     </issue>
 
@@ -1064,7 +1064,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceConvert.java"
-            line="51"
+            line="53"
             column="50"/>
     </issue>
 
@@ -1075,7 +1075,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceConvert.java"
-            line="105"
+            line="110"
             column="19"/>
     </issue>
 
@@ -1086,7 +1086,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceConvert.java"
-            line="105"
+            line="110"
             column="45"/>
     </issue>
 
@@ -1097,7 +1097,7 @@
         errorLine2="                                                                           ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceConvert.java"
-            line="105"
+            line="110"
             column="76"/>
     </issue>
 
@@ -1108,7 +1108,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceConvert.java"
-            line="157"
+            line="166"
             column="19"/>
     </issue>
 
@@ -1119,7 +1119,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceConvert.java"
-            line="158"
+            line="167"
             column="13"/>
     </issue>
 
@@ -1130,7 +1130,7 @@
         errorLine2="                               ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="112"
+            line="113"
             column="32"/>
     </issue>
 
@@ -1141,7 +1141,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="129"
+            line="130"
             column="22"/>
     </issue>
 
@@ -1152,7 +1152,7 @@
         errorLine2="                                            ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="129"
+            line="130"
             column="45"/>
     </issue>
 
@@ -1163,7 +1163,7 @@
         errorLine2="                                                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="129"
+            line="130"
             column="60"/>
     </issue>
 
@@ -1174,7 +1174,7 @@
         errorLine2="                             ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="130"
+            line="131"
             column="30"/>
     </issue>
 
@@ -1185,7 +1185,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="141"
+            line="142"
             column="22"/>
     </issue>
 
@@ -1196,7 +1196,7 @@
         errorLine2="                                            ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="141"
+            line="142"
             column="45"/>
     </issue>
 
@@ -1207,7 +1207,7 @@
         errorLine2="                                                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="141"
+            line="142"
             column="60"/>
     </issue>
 
@@ -1218,7 +1218,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="142"
+            line="143"
             column="30"/>
     </issue>
 
@@ -1229,95 +1229,40 @@
         errorLine2="                     ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="158"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceItem(PendingIntent intent, Slice slice, String format, String subType,"
-        errorLine2="                                           ~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceItem.java"
-            line="158"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceItem(PendingIntent intent, Slice slice, String format, String subType,"
-        errorLine2="                                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceItem.java"
-            line="158"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceItem(PendingIntent intent, Slice slice, String format, String subType,"
-        errorLine2="                                                                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceItem.java"
-            line="158"
-            column="72"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            @Slice.SliceHint String[] hints) {"
-        errorLine2="                             ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceItem.java"
             line="159"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceItem(ActionHandler action, Slice slice, String format, String subType,"
-        errorLine2="                     ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceItem.java"
-            line="167"
             column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceItem(ActionHandler action, Slice slice, String format, String subType,"
+        errorLine1="    public SliceItem(PendingIntent intent, Slice slice, String format, String subType,"
         errorLine2="                                           ~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="167"
+            line="159"
             column="44"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceItem(ActionHandler action, Slice slice, String format, String subType,"
+        errorLine1="    public SliceItem(PendingIntent intent, Slice slice, String format, String subType,"
         errorLine2="                                                        ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="167"
+            line="159"
             column="57"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceItem(ActionHandler action, Slice slice, String format, String subType,"
+        errorLine1="    public SliceItem(PendingIntent intent, Slice slice, String format, String subType,"
         errorLine2="                                                                       ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="167"
+            line="159"
             column="72"/>
     </issue>
 
@@ -1328,7 +1273,62 @@
         errorLine2="                             ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
+            line="160"
+            column="30"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public SliceItem(ActionHandler action, Slice slice, String format, String subType,"
+        errorLine2="                     ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/SliceItem.java"
             line="168"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public SliceItem(ActionHandler action, Slice slice, String format, String subType,"
+        errorLine2="                                           ~~~~~">
+        <location
+            file="src/main/java/androidx/slice/SliceItem.java"
+            line="168"
+            column="44"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public SliceItem(ActionHandler action, Slice slice, String format, String subType,"
+        errorLine2="                                                        ~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/SliceItem.java"
+            line="168"
+            column="57"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public SliceItem(ActionHandler action, Slice slice, String format, String subType,"
+        errorLine2="                                                                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/SliceItem.java"
+            line="168"
+            column="72"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            @Slice.SliceHint String[] hints) {"
+        errorLine2="                             ~~~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/SliceItem.java"
+            line="169"
             column="30"/>
     </issue>
 
@@ -1339,7 +1339,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="193"
+            line="194"
             column="42"/>
     </issue>
 
@@ -1350,7 +1350,7 @@
         errorLine2="                      ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="210"
+            line="211"
             column="23"/>
     </issue>
 
@@ -1361,7 +1361,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="223"
+            line="224"
             column="12"/>
     </issue>
 
@@ -1372,7 +1372,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="230"
+            line="231"
             column="12"/>
     </issue>
 
@@ -1383,7 +1383,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="240"
+            line="241"
             column="12"/>
     </issue>
 
@@ -1394,7 +1394,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="259"
+            line="260"
             column="12"/>
     </issue>
 
@@ -1405,7 +1405,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="268"
+            line="269"
             column="12"/>
     </issue>
 
@@ -1416,7 +1416,7 @@
         errorLine2="           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="310"
+            line="311"
             column="12"/>
     </issue>
 
@@ -1427,7 +1427,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="326"
+            line="327"
             column="12"/>
     </issue>
 
@@ -1438,7 +1438,7 @@
         errorLine2="                                            ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="345"
+            line="346"
             column="45"/>
     </issue>
 
@@ -1449,7 +1449,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="353"
+            line="354"
             column="22"/>
     </issue>
 
@@ -1460,7 +1460,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="365"
+            line="366"
             column="12"/>
     </issue>
 
@@ -1471,7 +1471,7 @@
         errorLine2="                                             ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="378"
+            line="379"
             column="46"/>
     </issue>
 
@@ -1482,7 +1482,7 @@
         errorLine2="                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="392"
+            line="393"
             column="49"/>
     </issue>
 
@@ -1493,7 +1493,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="456"
+            line="461"
             column="19"/>
     </issue>
 
@@ -1504,7 +1504,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="456"
+            line="461"
             column="39"/>
     </issue>
 
@@ -1515,7 +1515,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="490"
+            line="495"
             column="12"/>
     </issue>
 
@@ -1526,7 +1526,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="490"
+            line="495"
             column="28"/>
     </issue>
 
@@ -1537,7 +1537,7 @@
         errorLine2="                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="705"
+            line="710"
             column="23"/>
     </issue>
 
@@ -1548,7 +1548,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="705"
+            line="710"
             column="39"/>
     </issue>
 
@@ -1559,7 +1559,7 @@
         errorLine2="                                                       ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="705"
+            line="710"
             column="56"/>
     </issue>
 
@@ -1570,7 +1570,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="52"
+            line="54"
             column="19"/>
     </issue>
 
@@ -1581,7 +1581,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="56"
+            line="58"
             column="12"/>
     </issue>
 
@@ -1592,7 +1592,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="85"
+            line="89"
             column="28"/>
     </issue>
 
@@ -1603,7 +1603,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="85"
+            line="89"
             column="43"/>
     </issue>
 
@@ -1614,7 +1614,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="121"
+            line="128"
             column="12"/>
     </issue>
 
@@ -1625,7 +1625,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="121"
+            line="128"
             column="26"/>
     </issue>
 
@@ -1636,7 +1636,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="153"
+            line="162"
             column="21"/>
     </issue>
 
@@ -1647,7 +1647,7 @@
         errorLine2="                                            ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="153"
+            line="162"
             column="45"/>
     </issue>
 
@@ -1658,7 +1658,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="166"
+            line="175"
             column="16"/>
     </issue>
 
@@ -1669,7 +1669,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="176"
+            line="185"
             column="29"/>
     </issue>
 
diff --git a/slices/test/lint-baseline.xml b/slices/test/lint-baseline.xml
index 1f3f6e3..9e0b0c7 100644
--- a/slices/test/lint-baseline.xml
+++ b/slices/test/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="127"
+            line="129"
             column="19"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="127"
+            line="129"
             column="30"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="127"
+            line="129"
             column="43"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="147"
+            line="149"
             column="12"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="654"
+            line="658"
             column="19"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                                ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SliceBroadcastReceiver.java"
-            line="44"
+            line="43"
             column="33"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                                                 ~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SliceBroadcastReceiver.java"
-            line="44"
+            line="43"
             column="50"/>
     </issue>
 
diff --git a/slices/view/lint-baseline.xml b/slices/view/lint-baseline.xml
index 48f2e59..e0bb13b 100644
--- a/slices/view/lint-baseline.xml
+++ b/slices/view/lint-baseline.xml
@@ -13,6 +13,17 @@
     </issue>
 
     <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="    @TargetApi(Build.VERSION_CODES.LOLLIPOP)"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/widget/LocationBasedViewTracker.java"
+            line="47"
+            column="5"/>
+    </issue>
+
+    <issue
         id="UnsafeNewApiCall"
         message="This call is to a method from API 20, the call containing class androidx.slice.widget.ActionRow is not annotated with @RequiresApi(x) where x is at least 20. Either annotate the containing class with at least @RequiresApi(20) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(20)."
         errorLine1="        if (input.getRemoteInput().getAllowFreeFormInput()) {"
@@ -778,7 +789,7 @@
         errorLine2="                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowContent.java"
-            line="81"
+            line="82"
             column="23"/>
     </issue>
 
@@ -789,7 +800,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowContent.java"
-            line="332"
+            line="337"
             column="12"/>
     </issue>
 
@@ -800,7 +811,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowContent.java"
-            line="339"
+            line="344"
             column="12"/>
     </issue>
 
@@ -811,7 +822,7 @@
         errorLine2="                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowContent.java"
-            line="351"
+            line="356"
             column="26"/>
     </issue>
 
@@ -822,7 +833,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowContent.java"
-            line="351"
+            line="356"
             column="44"/>
     </issue>
 
@@ -1588,22 +1599,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static SliceMetadata from(@NonNull Context context, @NonNull Slice slice) {"
-        errorLine2="                  ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceMetadata.java"
-            line="117"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public List&lt;SliceAction> getToggles() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceMetadata.java"
-            line="232"
+            line="246"
             column="12"/>
     </issue>
 
@@ -1614,7 +1614,7 @@
         errorLine2="                                    ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceMetadata.java"
-            line="257"
+            line="276"
             column="37"/>
     </issue>
 
@@ -1625,7 +1625,7 @@
         errorLine2="           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceMetadata.java"
-            line="502"
+            line="523"
             column="12"/>
     </issue>
 
diff --git a/textclassifier/integration-tests/testapp/lint-baseline.xml b/textclassifier/integration-tests/testapp/lint-baseline.xml
index 3c2dce4..c33b099 100644
--- a/textclassifier/integration-tests/testapp/lint-baseline.xml
+++ b/textclassifier/integration-tests/testapp/lint-baseline.xml
@@ -2,204 +2,6 @@
 <issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
-        id="PrivateConstructorForUtilityClass"
-        message="Utility class with non private constructor"
-        errorLine1="        /**"
-        errorLine2="        ^">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="492"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 21, the call containing class androidx.textclassifier.integration.testapp.experimental.widget.FloatingToolbar.FloatingToolbarPopup is not annotated with @RequiresApi(x) where x is at least 21. Either annotate the containing class with at least @RequiresApi(21) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(21)."
-        errorLine1="            contentContainer.setClipToOutline(true);"
-        errorLine2="                             ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="320"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnsafeNewApiCall"
-        message="This call is to a method from API 23, the call containing class androidx.textclassifier.integration.testapp.experimental.widget.FloatingToolbar.FloatingToolbarPopup is not annotated with @RequiresApi(x) where x is at least 23. Either annotate the containing class with at least @RequiresApi(23) or move the call to a static method in a wrapper class annotated with at least @RequiresApi(23)."
-        errorLine1="            popupWindow.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="332"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="IFloatingToolbar can only be accessed from within the same library group (groupId=androidx.textclassifier)"
-        errorLine1="public final class FloatingToolbar implements IFloatingToolbar {"
-        errorLine2="                                              ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="58"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="        mMenu = Preconditions.checkNotNull(menu);"
-        errorLine2="                ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="120"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="MenuItemImpl.requestsActionButton can only be called from within the same library group prefix (referenced groupId=`androidx.appcompat` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="            return !impl.requiresActionButton() &amp;&amp; !impl.requestsActionButton();"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="232"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="MenuItemImpl.requiresActionButton can only be called from within the same library group prefix (referenced groupId=`androidx.appcompat` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="            return !impl.requiresActionButton() &amp;&amp; !impl.requestsActionButton();"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="232"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SupportMenuItem.requiresActionButton can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="                &amp;&amp; menuItem.requiresActionButton();"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="240"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="            mHost = Preconditions.checkNotNull(host);"
-        errorLine2="                    ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="269"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="            Preconditions.checkNotNull(contentRectOnScreen);"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="285"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="                mWidget = Preconditions.checkNotNull(widget);"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="359"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="                mContext = Preconditions.checkNotNull(context);"
-        errorLine2="                           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="361"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="                        Preconditions.checkNotNull(menuItemButtonOnClickListener);"
-        errorLine2="                        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="363"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="                Preconditions.checkNotNull(menuItems);"
-        errorLine2="                ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="380"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SupportMenuItem.getTooltipText can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="                    CharSequence tooltip = item.getTooltipText() == null"
-        errorLine2="                                                ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="477"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SupportMenuItem.getTooltipText can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.textclassifier.integration-tests`)"
-        errorLine1="                            : item.getTooltipText();"
-        errorLine2="                                   ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="479"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `mOnMenuItemClickListener` of class `FloatingToolbarPopup` requires synthetic accessor"
-        errorLine1="                            if (mOnMenuItemClickListener != null) {"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="260"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `mOnMenuItemClickListener` of class `FloatingToolbarPopup` requires synthetic accessor"
-        errorLine1="                                mOnMenuItemClickListener.onMenuItemClick("
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="261"
-            column="33"/>
-    </issue>
-
-    <issue
         id="SyntheticAccessor"
         message="Access to `private` method `setTextClassifier` of class `MainActivity` requires synthetic accessor"
         errorLine1="                    setTextClassifier(null);"
@@ -235,17 +37,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public FloatingToolbar(View view) {"
-        errorLine2="                           ~~~~">
-        <location
-            file="src/main/java/androidx/textclassifier/integration/testapp/experimental/widget/FloatingToolbar.java"
-            line="114"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
diff --git a/transition/transition/lint-baseline.xml b/transition/transition/lint-baseline.xml
index 1af8218..c0b677b 100644
--- a/transition/transition/lint-baseline.xml
+++ b/transition/transition/lint-baseline.xml
@@ -4,12 +4,12 @@
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="    /**"
-        errorLine2="    ^">
+        errorLine1="    private static class ArrayListManager {"
+        errorLine2="                         ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="2369"
-            column="5"/>
+            line="2379"
+            column="26"/>
     </issue>
 
     <issue
diff --git a/tv-provider/tv-provider/lint-baseline.xml b/tv-provider/tv-provider/lint-baseline.xml
index 76d77ca..10d144f 100644
--- a/tv-provider/tv-provider/lint-baseline.xml
+++ b/tv-provider/tv-provider/lint-baseline.xml
@@ -4,12 +4,12 @@
     <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class with non private constructor"
-        errorLine1="/** A utility class for conveniently storing and loading channel logos. */"
-        errorLine2="^">
+        errorLine1="public class ChannelLogoUtils {"
+        errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java"
-            line="40"
-            column="1"/>
+            line="42"
+            column="14"/>
     </issue>
 
     <issue
diff --git a/wear/wear-complications-data/lint-baseline.xml b/wear/wear-complications-data/lint-baseline.xml
new file mode 100644
index 0000000..d52013b
--- /dev/null
+++ b/wear/wear-complications-data/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(Build.VERSION_CODES.N)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/complications/ComplicationHelperActivity.java"
+            line="56"
+            column="1"/>
+    </issue>
+
+</issues>
diff --git a/wear/wear-watchface-data/lint-baseline.xml b/wear/wear-watchface-data/lint-baseline.xml
new file mode 100644
index 0000000..e66fe67
--- /dev/null
+++ b/wear/wear-watchface-data/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(VERSION_CODES.KITKAT)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/android/support/wearable/watchface/accessibility/ContentDescriptionLabel.java"
+            line="46"
+            column="1"/>
+    </issue>
+
+</issues>
diff --git a/wear/wear-watchface/lint-baseline.xml b/wear/wear-watchface/lint-baseline.xml
new file mode 100644
index 0000000..49b77e50
--- /dev/null
+++ b/wear/wear-watchface/lint-baseline.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(16)"
+        errorLine2="~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/ui/WatchFaceConfigActivity.kt"
+            line="71"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="BanTargetApiAnnotation"
+        message="Uses @TargetApi annotation"
+        errorLine1="@TargetApi(26)"
+        errorLine2="~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/WatchFaceService.kt"
+            line="234"
+            column="1"/>
+    </issue>
+
+</issues>
diff --git a/work/workmanager/lint-baseline.xml b/work/workmanager/lint-baseline.xml
index 4baafad..2edbe70 100644
--- a/work/workmanager/lint-baseline.xml
+++ b/work/workmanager/lint-baseline.xml
@@ -382,7 +382,7 @@
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/WorkManagerImpl.java"
-            line="756"
+            line="759"
             column="71"/>
     </issue>