Snap for 5622519 from fe4b8179b63eb376b3b189ef9b3463ad523b26f1 to pi-platform-release

Change-Id: I08ca3238028cec7a1b10883e6938684dc89f2152
diff --git a/tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java b/tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java
index 8b89269..1e2739d 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java
@@ -50,7 +50,6 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
-import com.android.internal.net.VpnInfo;
 import com.android.internal.net.VpnProfile;
 import com.android.internal.util.AsyncChannel;
 import com.android.server.connectivity.NetworkAgentInfo;
@@ -636,11 +635,6 @@
     }
 
     @Override
-    public VpnInfo[] getAllVpnInfo() {
-        throw new RuntimeException("not implemented");
-    }
-
-    @Override
     public VpnConfig getVpnConfig(int userId) {
         throw new RuntimeException("not implemented");
     }