Merge "InetDiagSocketTest: ignore test that times out"