Add framework-connectivity-pre-jarjar-without-cronet

This is required to build cronet against ConnectivityManager hidden APIs
Since framework-connectivity contains cronet, cronet target can not
depend on framework-connectivity.
So this CL splits framework-connectivity-pre-jarjar.
Cronet target can depend on
framework-connectivity-pre-jarjar-without-cronet and use
ConnectivityManager hidden APIs.

Test: TH
Bug: 311792075
Change-Id: Ib7724e8e6bd0226b437ed6f0010658d45aaa1150

framework/Android.bp

@@ -108,14 +108,13 @@ java_defaults {
     ],
 }
 
+// Library to allow Cronet to use hidden APIs
 java_library {
-    name: "framework-connectivity-pre-jarjar",
+    name: "framework-connectivity-pre-jarjar-without-cronet",
     defaults: [
         "framework-connectivity-defaults",
     ],
     static_libs: [
-        "httpclient_api",
-        "httpclient_impl",
         // Framework-connectivity-pre-jarjar is identical to framework-connectivity
         // implementation, but without the jarjar rules. However, framework-connectivity
         // is not based on framework-connectivity-pre-jarjar, it's rebuilt from source
@@ -133,6 +132,21 @@ java_library {
         "framework-tethering.impl",
         "framework-wifi.stubs.module_lib",
     ],
+    visibility: ["//external/cronet:__subpackages__"],
+}
+
+java_library {
+    name: "framework-connectivity-pre-jarjar",
+    defaults: ["framework-module-defaults"],
+    min_sdk_version: "30",
+    static_libs: [
+        "framework-connectivity-pre-jarjar-without-cronet",
+        "httpclient_api",
+        "httpclient_impl",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
     visibility: ["//packages/modules/Connectivity:__subpackages__"],
 }