Snap for 7171598 from 3b3acc5c24fd5df42d621ec6df34a5b138001ee3 to sc-release

Change-Id: I98391803cfcbf91e311ba9c7d5ecaf60834c74cd
diff --git a/Android.bp b/Android.bp
index e0ee8da..6d4619b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -113,6 +113,11 @@
         "junit",
         "mockito",
     ],
+    // Avoid the tests running as unit tests. They have some jar requirement that doesn't currently
+    // quite work in CI.
+    test_options: {
+        unit_test: false,
+    },
 
     // Use Dagger2 annotation processor
     plugins: ["dagger2-compiler"],