ResolverController - log NAT64 prefix in standard format am: ee259935ea am: 403771af7b am: 9bbd475857

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1608477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76fa72c8c72be61a0e402a11ae6457e9cf438ca6
diff --git a/Android.bp b/Android.bp
index ceff82b..00d73c8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -165,7 +165,7 @@
     // Link most things statically to minimize our dependence on system ABIs.
     stl: "libc++_static",
     static_libs: [
-        "dnsresolver_aidl_interface-ndk_platform",
+        "dnsresolver_aidl_interface-unstable-ndk_platform",
         "libbase",
         "libcutils",
         "libnetdutils",
@@ -173,7 +173,7 @@
         "libstatslog_resolv",
         "libstatspush_compat",
         "libsysutils",
-        "netd_event_listener_interface-ndk_platform",
+        "netd_event_listener_interface-unstable-ndk_platform",
         "server_configurable_flags",
         "stats_proto",
     ],
diff --git a/TEST_MAPPING b/TEST_MAPPING
index f79e303..449f270 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,10 +7,11 @@
         { "name": "resolv_stats_test_utils_test" }
     ],
     "mainline-presubmit": [
-        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
-        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
-        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
-        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
-        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" }
+        // TODO: add back the tethering module when it is updatable in this branch
+        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },
+        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },
+        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },
+        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },
+        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" }
     ]
 }
diff --git a/resolv_test_config_template.xml b/resolv_test_config_template.xml
index 0af8b3b..63a8cba 100644
--- a/resolv_test_config_template.xml
+++ b/resolv_test_config_template.xml
@@ -21,6 +21,7 @@
 <configuration description="Configuration for {MODULE} tests">
    <option name="test-suite-tag" value="mts" />
    <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
+   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />
    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
        <option name="cleanup" value="true" />
diff --git a/tests/Android.bp b/tests/Android.bp
index 5b90563..68e7b68 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -223,7 +223,10 @@
     ],
     defaults: ["netd_defaults", "resolv_test_defaults"],
     test_suites: ["general-tests"],
-    test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],
+    test_mainline_modules: [
+        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex",
+        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"
+    ],
     static_libs: [
         "libgmock",
         "libprotobuf-cpp-lite",
diff --git a/tests/resolv_gold_test_config.xml b/tests/resolv_gold_test_config.xml
index 8b7f8dd..ceddd80 100644
--- a/tests/resolv_gold_test_config.xml
+++ b/tests/resolv_gold_test_config.xml
@@ -16,6 +16,7 @@
 <configuration description="Configuration for resolv gold tests">
    <option name="test-suite-tag" value="mts" />
    <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
+   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />
    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
        <option name="cleanup" value="true" />