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

Change-Id: I6321cc3559dcf4449d947cbb8dc95a1aea23d174