Merge "InetDiagSocketTest: ignore test that times out"
am: 152ced4b87

Change-Id: Iff27cea9d43b6a044e0f91cc88fad46664b4660b