[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30
am:caee99b3cf-s ours am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1b84038696cis in history Change-Id: I216e490624ce14e2b4dacff9381a7d8c96276349
This commit is contained in: