Snap for 7526818 from a2f9c47520f266d9904ce019b6946bf21c016c82 to sc-d1-release

Change-Id: I7a8c6f77b16cadb69b95e739eeeb4e6d280e67b1
diff --git a/client-libs/tests/unit/Android.bp b/client-libs/tests/unit/Android.bp
index 2cd39bd..220a6c1 100644
--- a/client-libs/tests/unit/Android.bp
+++ b/client-libs/tests/unit/Android.bp
@@ -23,7 +23,8 @@
         // Visible for Tethering and NetworkStack integration test and link NetdStaticLibTestsLib
         // there, so that the tests under client-libs can also be run when running tethering and
         // NetworkStack MTS.
-        "//packages/modules/Connectivity/Tethering/tests/integration",
+        "//packages/modules/Connectivity/tests:__subpackages__",
+        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
         "//packages/modules/NetworkStack/tests/integration",
     ]
 }
diff --git a/common/tests/unit/Android.bp b/common/tests/unit/Android.bp
index c9aad71..23835fe 100644
--- a/common/tests/unit/Android.bp
+++ b/common/tests/unit/Android.bp
@@ -24,7 +24,8 @@
     ],
     visibility: [
         "//frameworks/base/packages/Tethering/tests/integration",
-        "//packages/modules/Connectivity/Tethering/tests/integration",
+        "//packages/modules/Connectivity/tests:__subpackages__",
+        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
         "//packages/modules/NetworkStack/tests/integration",
     ]
 }