Test: atest InetDiagSocketTest
Change-Id: Ieef0ca291924c0d81b1110bd25020d57fa9f0fec
Merged-In: Ieef0ca291924c0d81b1110bd25020d57fa9f0fec
Bug: 141870193
Bug: 141459241
(cherry picked from commit 69b83c9b3c)
Clean cherry pick.
Test: atest InetDiagSocketTest
Change-Id: Ieef0ca291924c0d81b1110bd25020d57fa9f0fec
Merged-In: Ieef0ca291924c0d81b1110bd25020d57fa9f0fec
Bug: 141870193
Bug: 141459241
(cherry picked from commit 69b83c9b3c)
Clean cherry pick.