Merge "Disable InetDiagSocketTest in a better way." am: c28356b9c6

am: cc94ad60b0

Change-Id: I3d8cebec00dde7d0b61469f36887cd5afface043

tests/net/java/android/net/netlink/InetDiagSocketTest.java

@@ -45,6 +45,7 @@ import androidx.test.runner.AndroidJUnit4;
 import libcore.util.HexEncoding;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -189,6 +190,8 @@ public class InetDiagSocketTest {
         udp.close();
     }
 
+    @Ignore
+    @Test
     public void testGetConnectionOwnerUid() throws Exception {
         checkGetConnectionOwnerUid("::", null);
         checkGetConnectionOwnerUid("::", "::");