Merge "Remove explicit dependency on conscrypt"
am: 92ed75c5f7

Change-Id: I46191c34b492a7ccb4c679a8e5d133d29a407b15
diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index 1430071..6967adb 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -26,7 +26,6 @@
 
 LOCAL_JAVA_LIBRARIES := \
     voip-common \
-    conscrypt \
     org.apache.http.legacy \
     android.test.base.stubs \