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

Change-Id: I34890df3f3f36a9a6c43c9635f87b9c9b096f497