Snap for 10214594 from 2bf47bf46ee51bc0878cf469c803635a21a1cb62 to sdk-release

Change-Id: I039aaf97c9e8411c1a4a3f2f547570ae2ab64f41
diff --git a/tests/Android.bp b/tests/Android.bp
index 55eb1c7..88df0dc 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -23,11 +23,14 @@
     main: "fmq_test.py",
     srcs: ["fmq_test.py"],
     test_config: "fmq_test.xml",
-    target_required: [
+    data_device_bins_both: [
         "android.hardware.tests.msgq@1.0-service-test",
         "fmq_test_client",
     ],
-    test_suites: ["general-tests", "vts"],
+    test_suites: [
+        "general-tests",
+        "vts",
+    ],
     test_options: {
         unit_test: false,
     },
@@ -67,7 +70,7 @@
     ],
     whole_static_libs: [
         "android.hardware.tests.msgq@1.0-impl",
-        "android.fmq.test-impl"
+        "android.fmq.test-impl",
     ],
 
     compile_multilib: "both",
@@ -79,7 +82,10 @@
             suffix: "64",
         },
     },
-    test_suites: ["general-tests", "vts"],
+    test_suites: [
+        "general-tests",
+        "vts",
+    ],
     auto_gen_config: false,
 }