Merge changes from topic "presubmit-am-5cb98b83274540c4ab7f7303dcd08e5a" into tm-dev

* changes:
  [automerge] Rename Encoder test names. 2p: 0c1f32bfa2
  Rename Encoder test names.
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 72e022b..370acd6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -21,6 +21,25 @@
       "name": "TCSModelDownloaderIntegrationTest"
     }
   ],
+  "hwasan-postsubmit": [
+    {
+      "name": "TextClassifierServiceTest",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "libtextclassifier_tests"
+    },
+    {
+      "name": "libtextclassifier_java_tests"
+    },
+    {
+      "name": "TextClassifierNotificationTests"
+    }
+  ],
   "mainline-presubmit": [
     {
       "name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"