Merge changes from topic "cs-generalize-underlying-networks"
* changes:
Update NetworkAgentTest to support generalized underlying networks.
Minor fixes to NetworkAgentTest.
diff --git a/tests/cts/tethering/OWNERS b/tests/cts/OWNERS
similarity index 81%
rename from tests/cts/tethering/OWNERS
rename to tests/cts/OWNERS
index cd6abeb..4264345 100644
--- a/tests/cts/tethering/OWNERS
+++ b/tests/cts/OWNERS
@@ -1,4 +1,4 @@
# Bug component: 31808
+set noparent
lorenzo@google.com
-satk@google.com
-
+satk@google.com
\ No newline at end of file
diff --git a/tests/cts/hostside/OWNERS b/tests/cts/hostside/OWNERS
index 52c8053..20bc55e 100644
--- a/tests/cts/hostside/OWNERS
+++ b/tests/cts/hostside/OWNERS
@@ -1,4 +1,4 @@
# Bug component: 61373
+# Inherits parent owners
sudheersai@google.com
-lorenzo@google.com
jchalard@google.com
diff --git a/tests/cts/net/OWNERS b/tests/cts/net/OWNERS
index 7722bb3..432bd9b 100644
--- a/tests/cts/net/OWNERS
+++ b/tests/cts/net/OWNERS
@@ -1,5 +1,3 @@
# Bug component: 31808
-lorenzo@google.com
-satk@google.com
-
+# Inherits parent owners
per-file src/android/net/cts/NetworkWatchlistTest.java=alanstokes@google.com