Revert "Enable "AsyncDns" feature by default on Android"

This reverts commit 0532f223eac50c7aee9677bf499ba6c5c182a41f.

Reason for revert: Full launch needs to be rolled back and retried in a future milestone due to a bug. The experiment cleanup here was premature.

Original change's description:
> Enable "AsyncDns" feature by default on Android
> 
> Also clean up Android-specific experiment code, but leave the
> base::Feature.
> 
> Bug: 768874
> Change-Id: Ic7b81a878e3e81bc1a5c2c2fae242df23c5387ca
> Reviewed-on: https://chromium-review.googlesource.com/868077
> Reviewed-by: Ilya Sherman <[email protected]>
> Commit-Queue: Miriam Gershenson <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#529866}

[email protected],[email protected]

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 768874, 805020
Change-Id: Ib67c727aef748b4e80714e6128c3bfbdc24d3544
Reviewed-on: https://chromium-review.googlesource.com/881206
Reviewed-by: Miriam Gershenson <[email protected]>
Commit-Queue: Miriam Gershenson <[email protected]>
Cr-Commit-Position: refs/heads/master@{#531381}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index b372c15..28493e28 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3518,6 +3518,12 @@
                                     kSpeculativePreconnectFeatureVariations,
                                     "SpeculativePreconnectValidation")},
 
+#if defined(OS_ANDROID)
+    {"enable-async-dns", flag_descriptions::kAsyncDnsName,
+     flag_descriptions::kAsyncDnsDescription, kOsAndroid,
+     FEATURE_VALUE_TYPE(features::kAsyncDns)},
+#endif  // defined(OS_ANDROID)
+
     {"enable-overflow-icons-for-media-controls",
      flag_descriptions::kOverflowIconsForMediaControlsName,
      flag_descriptions::kOverflowIconsForMediaControlsDescription, kOsAll,
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index cc4a04e..69869d5 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1683,6 +1683,9 @@
 const char kAndroidViewPasswordsDescription[] =
     "Enables copying and viewing passwords in settings.";
 
+const char kAsyncDnsName[] = "Async DNS resolver";
+const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
+
 const char kAutofillAccessoryViewName[] =
     "Autofill suggestions as keyboard accessory view";
 const char kAutofillAccessoryViewDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 3c52bac..b34b428 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1035,6 +1035,9 @@
 extern const char kAndroidViewPasswordsName[];
 extern const char kAndroidViewPasswordsDescription[];
 
+extern const char kAsyncDnsName[];
+extern const char kAsyncDnsDescription[];
+
 extern const char kAutofillAccessoryViewName[];
 extern const char kAutofillAccessoryViewDescription[];
 
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index b113b581..300e0f39 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -71,7 +71,7 @@
 // Enables the built-in DNS resolver.
 const base::Feature kAsyncDns {
   "AsyncDns",
-#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
       base::FEATURE_ENABLED_BY_DEFAULT
 #else
       base::FEATURE_DISABLED_BY_DEFAULT