Snap for 8512216 from 85ff19dd086929bb58abe444c4dfe2f473494ecd to tm-frc-os-statsd-release

Change-Id: I7be5d4f3fa71511e56bbb004d05fc7c561be93f3
diff --git a/Android.bp b/Android.bp
index a30a55b..21e5861 100644
--- a/Android.bp
+++ b/Android.bp
@@ -72,6 +72,7 @@
     apex_available: [
         "com.android.art",
         "com.android.art.debug",
+        "com.android.bluetooth",
         "//apex_available:platform", // For odsign.
     ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 60222f9..f9d70d8 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,5 +3,10 @@
     {
       "name": "tinyxml2-tests"
     }
+  ],
+  "hwasan-presubmit": [
+    {
+      "name": "tinyxml2-tests"
+    }
   ]
 }