Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903

Bug: 166295507
Merged-In: Ic37849792499c359b81edabd384c7f3916ffc459
Change-Id: Ia69b5e8baa3c3902095245d7747bb3d44f4b4094

2 files changed, 19 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index c41f5181..4e5c4ac0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,6 +20,7 @@ cc_library_headers {
     apex_available: [
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
+        "com.android.extservices",
         "//apex_available:platform",
     ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 00000000..35e7be0c
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "TextClassifierServiceTest",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+       "name": "bluetooth_flatbuffer_tests"
+    },
+    {
+       "name": "CtsTfliteNnapiDelegateTestCases"
+    }
+ ]
+}