[automerger skipped] Temporarily disable InetDiagSocketTest. am: db54f46641 -s ours
am: 43eb1e3009 -s ours
am skip reason: change_id Ic580b9261e0d556ec10f92ddffd8f2766e25f424 with SHA1 fdc03bab0b is in history

Change-Id: I798264881b6279bfef9ac4c65e9dd9bdb777f448