Revert "[NS D06] Implement more policies"

Revert submission 10343065

Reason for revert: This is part of a feature that was punted out of R.
Reverted Changes:
Ic9a3d3363:[NS D05] Rework how to tear down networks
I7d815f873:[NS D06] Implement more policies
I561098476:[NS D07] Use the unmodified legacy score

Change-Id: I378449443f99eb0a7f01f31f53398b8f55ce87f1

tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt

@@ -16,14 +16,8 @@
 
 package com.android.server.connectivity
 
-import android.net.ConnectivityManager.TYPE_WIFI
-import android.net.LinkProperties
-import android.net.Network
-import android.net.NetworkAgentConfig
 import android.net.NetworkCapabilities
-import android.net.NetworkInfo
 import android.net.NetworkRequest
-import android.net.NetworkScore
 import androidx.test.filters.SmallTest
 import androidx.test.runner.AndroidJUnit4
 import org.junit.Test
@@ -39,24 +33,10 @@ import kotlin.test.assertNull
 class NetworkRankerTest {
     private val ranker = NetworkRanker()
 
-    private fun makeNai(satisfy: Boolean, score: Int) = object : NetworkAgentInfo(
-            null /* messenger */,
-            null /* asyncChannel*/,
-            Network(100),
-            NetworkInfo(TYPE_WIFI, 0 /* subtype */, "" /* typename */, "" /* subtypename */),
-            LinkProperties(),
-            NetworkCapabilities(),
-            NetworkScore.Builder().setLegacyScore(score).build(),
-            null /* context */,
-            null /* handler */,
-            NetworkAgentConfig(),
-            null /* connectivityService */,
-            null /* netd */,
-            null /* dnsResolver */,
-            null /* networkManagementService */,
-            0 /* factorySerialNumber */) {
-        override fun satisfies(request: NetworkRequest?): Boolean = satisfy
-        override fun getCurrentScore(): Int = score
+    private fun makeNai(satisfy: Boolean, score: Int) = mock(NetworkAgentInfo::class.java).also {
+        doReturn(satisfy).`when`(it).satisfies(any())
+        doReturn(score).`when`(it).currentScore
+        it.networkCapabilities = NetworkCapabilities()
     }
 
     @Test