[automerger skipped] InetDiagSocketTest: ignore test that times out am: dadd2112f0 -s ours
am: db995575ac -s ours
am skip reason: change_id Ieef0ca291924c0d81b1110bd25020d57fa9f0fec with SHA1 69b83c9b3c is in history

Change-Id: Id0fe46e06f4ca214e5b574d30a907c4e8d025df3