Snap for 8564071 from 0da22af113df5604d00169b762c807ba327cadbc to mainline-resolv-release

Change-Id: I619e9413efd64b49438e4d01aea5a448544c7d78

2 files changed, 18 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index c1c0308c..5fb3e608 100644
--- a/Android.bp
+++ b/Android.bp
@@ -117,8 +117,9 @@ cc_library {
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth.updatable",
+        "com.android.bluetooth",
     ],
+    min_sdk_version: "30",
 }
 
 cc_defaults {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 35e7be0c..23e3cbf7 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -14,5 +14,21 @@
     {
        "name": "CtsTfliteNnapiDelegateTestCases"
     }
+ ],
+  "hwasan-postsubmit": [
+    {
+      "name": "TextClassifierServiceTest",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+       "name": "bluetooth_flatbuffer_tests"
+    },
+    {
+       "name": "CtsTfliteNnapiDelegateTestCases"
+    }
  ]
 }