Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours
am:b8b8d703d9-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1d51ae5760dis in history Change-Id: Ic9514c32f1e0c6e9565b114f98f02cb4c97d35b7
This commit is contained in: