Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: 6df286c92f -s ours am: 48516f991b -s ours
am: f37e3848c2 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: If917cbb3b8f9ed30f67eb4d769dde8a09e8cf0d6
tree: 1d9a2b1975c4a1b295773752aa86438ae3f0e650
  1. tests/