Merge "Update the imports to androidx.test.filters.*" into main
diff --git a/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java b/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java
index 9ed987a..0be1c11 100644
--- a/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java
+++ b/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java
@@ -32,8 +32,8 @@
* Google-internal Android suite generators. Note that those generators also suppress any test
* annotated with LargeTest.
*
- * <p>Why use a custom annotation instead of {@code android.test.suitebuilder.annotation.Suppress}?
- * I'm not completely sure that this is the right choice, but it has various advantages:
+ * <p>Why use a custom annotation instead of {@code androidx.test.filters.Suppress}? I'm not
+ * completely sure that this is the right choice, but it has various advantages:
*
* <ul>
* <li>An annotation named just "Suppress" might someday be treated by a non-Android tool as a
diff --git a/guava-tests/test/com/google/common/base/AndroidIncompatible.java b/guava-tests/test/com/google/common/base/AndroidIncompatible.java
index 9ed987a..0be1c11 100644
--- a/guava-tests/test/com/google/common/base/AndroidIncompatible.java
+++ b/guava-tests/test/com/google/common/base/AndroidIncompatible.java
@@ -32,8 +32,8 @@
* Google-internal Android suite generators. Note that those generators also suppress any test
* annotated with LargeTest.
*
- * <p>Why use a custom annotation instead of {@code android.test.suitebuilder.annotation.Suppress}?
- * I'm not completely sure that this is the right choice, but it has various advantages:
+ * <p>Why use a custom annotation instead of {@code androidx.test.filters.Suppress}? I'm not
+ * completely sure that this is the right choice, but it has various advantages:
*
* <ul>
* <li>An annotation named just "Suppress" might someday be treated by a non-Android tool as a
