[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev

am: 0ff953bf1b -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history

Change-Id: Ia65a5ed54dd61a36d9f0f22fe2eae518c373230c
This commit is contained in:
markchien
2019-06-27 08:50:57 -07:00
committed by android-build-merger

Diff Content Not Available