Merge changes I1e6846e5,I827cd8ea

* changes:
  Do not count defaultOrConfiguredNetwork in #hashCode or #equals
  Construct a Builder with ChildSessionParams
diff --git a/tests/cts/Android.bp b/tests/cts/Android.bp
index 8800446..b9ec9d2 100644
--- a/tests/cts/Android.bp
+++ b/tests/cts/Android.bp
@@ -41,7 +41,7 @@
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
-        "mts",
+        "mts-ipsec",
         "vts",
         "general-tests",
     ],
diff --git a/tests/iketests/Android.bp b/tests/iketests/Android.bp
index 44e6af1..e5a445d 100644
--- a/tests/iketests/Android.bp
+++ b/tests/iketests/Android.bp
@@ -19,7 +19,7 @@
 
     platform_apis: true,
     certificate: "platform",
-    test_suites: ["device-tests", "mts"],
+    test_suites: ["device-tests", "mts-ipsec"],
 
     compile_multilib: "both",