Merge "Revert "Completely disable flaky APF multidevice CTS class"" into main

tests/cts/multidevices/Android.bp

@@ -21,8 +21,8 @@ python_test_host {
     name: "CtsConnectivityMultiDevicesTestCases",
     main: "run_tests.py",
     srcs: [
-        // "apfv4_test.py",
-        // "apfv6_test.py",
+        "apfv4_test.py",
+        "apfv6_test.py",
         "connectivity_multi_devices_test.py",
         "run_tests.py",
     ],

tests/cts/multidevices/run_tests.py

@@ -15,6 +15,8 @@
 """Main entrypoint for all of test cases."""
 
 import sys
+from apfv4_test import ApfV4Test
+from apfv6_test import ApfV6Test
 from connectivity_multi_devices_test import ConnectivityMultiDevicesTest
 from mobly import suite_runner
 
@@ -34,4 +36,4 @@ if __name__ == "__main__":
     index = sys.argv.index("--")
     sys.argv = sys.argv[:1] + sys.argv[index + 1 :]
   # TODO: make the tests can be executed without manually list classes.
-  suite_runner.run_suite([ConnectivityMultiDevicesTest], sys.argv)
+  suite_runner.run_suite([ConnectivityMultiDevicesTest, ApfV4Test, ApfV6Test], sys.argv)