Update DnsOverHttps fieldtrial config

Android is moving to the UI launched on other platforms. Also add a
disabled provider to better match the in-use configuration.

Change-Id: Id7bae5694a3d34cdbdec9bae28f1488282cea7f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2388147
Commit-Queue: Eric Orth <ericorth@chromium.org>
Commit-Queue: Brian White <bcwhite@chromium.org>
Auto-Submit: Eric Orth <ericorth@chromium.org>
Reviewed-by: Brian White <bcwhite@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803628}

testing/variations/fieldtrial_testing_config.json

@@ -2051,25 +2051,11 @@
             ]
         }
     ],
-    "DnsOverHttps": [
-        {
-            "platforms": [
-                "android",
-                "android_weblayer"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled_crbug1006105",
-                    "enable_features": [
-                        "DnsOverHttps"
-                    ]
-                }
-            ]
-        }
-    ],
     "DnsOverHttpsUi": [
         {
             "platforms": [
+                "android",
+                "android_weblayer",
                 "chromeos",
                 "mac",
                 "windows"
@@ -2078,6 +2064,7 @@
                 {
                     "name": "EnabledLaunch",
                     "params": {
+                        "DisabledProviders": "Comcast",
                         "ShowUi": "true"
                     },
                     "enable_features": [