Merge "Use connectivity APIs from framework-connectivity" into sc-dev

framework/Android.bp

@@ -35,7 +35,6 @@ java_library {
         ":framework-javastream-protos",
     ],
     apex_available: [
-        "//apex_available:platform",
         "com.android.tethering",
     ],
     jarjar_rules: "jarjar-rules-proto.txt",
@@ -125,7 +124,6 @@ java_sdk_library {
         "//packages/modules/Connectivity/Tethering/tests/unit",
     ],
     apex_available: [
-        "//apex_available:platform",
         "com.android.tethering",
     ],
 }

framework/src/android/net/NetworkUtils.java

@@ -42,6 +42,9 @@ import java.util.TreeSet;
  * {@hide}
  */
 public class NetworkUtils {
+    static {
+        System.loadLibrary("framework-connectivity-jni");
+    }
 
     private static final String TAG = "NetworkUtils";