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

Change-Id: I3d8cebec00dde7d0b61469f36887cd5afface043