Merge changes from topic "revert-2657749-revert-2647150-httpclient-wrapper-GZUDLKEBSH-IKOKBJPMHS" into main

* changes:
  Revert^2 "Connectivity: Depend on new httpclient targets"
  Revert^2 "Cronet's MTS: don't depend on platform Cronet"

Cronet/tests/mts/Android.bp

@@ -38,7 +38,11 @@ java_genrule {
 // tests need to inherit the NetHttpTests manifest.
 android_library {
     name: "NetHttpTestsLibPreJarJar",
-    static_libs: ["cronet_java_tests"],
+    static_libs: [
+        "cronet_aml_api_java",
+        "cronet_aml_java__testing",
+        "cronet_java_tests",
+    ],
     sdk_version: "module_current",
     min_sdk_version: "30",
 }
@@ -51,7 +55,8 @@ android_test {
      static_libs: ["NetHttpTestsLibPreJarJar"],
      jarjar_rules: ":net-http-test-jarjar-rules",
      jni_libs: [
-        "cronet_aml_components_cronet_android_cronet_tests__testing"
+        "cronet_aml_components_cronet_android_cronet__testing",
+        "cronet_aml_components_cronet_android_cronet_tests__testing",
      ],
      test_suites: [
          "general-tests",

framework/Android.bp

@@ -109,8 +109,8 @@ java_library {
         "framework-connectivity-defaults",
     ],
     static_libs: [
-        "cronet_aml_api_java",
+        "httpclient_api",
-        "cronet_aml_java",
+        "httpclient_impl",
     ],
     libs: [
         // This cannot be in the defaults clause above because if it were, it would be used
@@ -125,12 +125,12 @@ java_library {
 
 java_defaults {
     name: "CronetJavaDefaults",
-    srcs: [":cronet_aml_api_sources"],
+    srcs: [":httpclient_api_sources"],
     libs: [
         "androidx.annotation_annotation",
     ],
     impl_only_static_libs: [
-        "cronet_aml_java",
+        "httpclient_impl",
     ],
 }