Merge "Temporarily disable InetDiagSocketTest."
am: 5f2ae0dfbd

Change-Id: I7530c58091cff748e3eca9324cc66f7bec7e02b6