commit 52b82e33123a983fc7fb7374cdc1843f5d2fb5b0
author markchien <markchien@google.com> Wed Nov 21 22:56:31 2018 +0800
committer Austin Shin <austinshin@google.com> Fri Aug 09 12:45:45 2019 +0000
tree 51cf27311927d936e6942300355659edc79b1ebc
parent 8371c77499889e22437eafeece7ac022069e5d64

Exempt adb socket for hostside VpnTest

Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.

Bug: 119382723
Bug: 117194347
Test: - I solemnly swear I tested this conflict resolution
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
(cherry picked from commit de0f268f789222dd17d3c28c0f07656f2c168d81)