[automerger skipped] Avoid rely on NETWORK_STACK permission for...
[automerger skipped] Avoid rely on NETWORK_STACK permission for InetDiagSocketTest am: 11219dd0 am: 8be1e85d -s ours
am skip reason: Change-Id Ic38852839ead951972daa24f27ac95376787a72c with SHA-1 fa4549b7 is in history
Change-Id: I1365f63a9b83f838ff268007d788ffbae4493149