Merge changes from topic "revert-3031237-revert_v3-XCAXFZGHEH" into main

* changes:
  Revert "Revert "[Cronet] Exclude spaceship operator<=> from cove..."
  Reland Cronet 121_0_6167_71: Merge remote-tracking branch 'aosp/upstream-staging' into main

Author: colibie

Android.bp

@@ -177,20 +177,13 @@ filegroup {
 android_library {
     name: "cronet_java_tests",
     manifest: "components/cronet/android/test/src/org/chromium/net/AndroidManifest.xml",
-    srcs: [
-        ":cronet_logger_tests_sources",
-    ],
     sdk_version: "module_current",
     min_sdk_version: "30",
     static_libs: [
         "cronet_aml_components_cronet_android_cronet_javatests__testing",
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "cronet_aml_java__testing",
-        "cronet_experimental_options",
-        "cronet_rate_limiter",
-        "cronet_size_buckets",
-        "cronetstatslog_autogenerated_methods",
         "guava",
         "hamcrest-library",
         "junit",
@@ -212,103 +205,3 @@ android_library {
     ],
 }
 
-// ------------------------------ TELEMETRY TARGETS --------------------------------------------
-
-genrule {
-  name: "statslog-cronet-java-gen",
-  tools: ["stats-log-api-gen"],
-  cmd: "$(location stats-log-api-gen) --java $(out) --module cronet --javaPackage android.net.http --javaClass CronetStatsLog",
-  out: ["android/net/http/CronetStatsLog.java"],
-}
-
-java_library {
-    name: "cronetstatslog_autogenerated_methods",
-    srcs: [
-        ":statslog-cronet-java-gen",
-    ],
-    libs: [
-        "androidx.annotation_annotation",
-        "framework-statsd",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "cronet_experimental_options",
-    srcs: [
-        "android/java/src/android/net/http/ExperimentalOptions.java",
-    ],
-    libs: [
-        "cronetstatslog_autogenerated_methods",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "cronet_rate_limiter",
-    srcs: [
-        "android/java/src/android/net/http/RateLimiter.java",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "cronet_size_buckets",
-    srcs: [
-        "android/java/src/android/net/http/SizeBuckets.java",
-    ],
-    libs: [
-        "cronetstatslog_autogenerated_methods",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "http_client_logging",
-    srcs: [
-        "android/java/src/android/net/http/CronetLoggerImpl.java",
-    ],
-    static_libs: [
-        "cronetstatslog_autogenerated_methods",
-        "cronet_experimental_options",
-        "cronet_rate_limiter",
-        "cronet_size_buckets",
-    ],
-    libs: [
-        "androidx.annotation_annotation",
-        "cronet_aml_java",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-    visibility: [
-        "//packages/modules/Connectivity:__subpackages__",
-    ],
-}
-
-filegroup {
-   name: "cronet_logger_tests_sources",
-   srcs: [
-        "android/javatests/src/android/net/http/SizeBucketsTest.java",
-        "android/javatests/src/android/net/http/RateLimiterTest.java",
-        "android/javatests/src/android/net/http/ExperimentalOptionsTest.java",
-    ],
-}

Android.extras.bp

@@ -8,5 +8,5 @@ third_party {
     type: GIT
     value: "https://chromium.googlesource.com/chromium/src.git"
   }
-  version: "110.0.5481.154"
+  version: "121.0.6167.71"
 }