[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in hi skipped: 3df1075c11

Change-Id: Iebd2f338e22cc0ba4683bf419528bab6544581f7
tree: 167ad91fe8569942d3682c1db6b1317ffef424ee
  1. tests/