[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 history

Change-Id: I9be28d5c762c22e6c0b14a415a3d020450b443a6
tree: 878bec7911ca38ca7e62b91ac6f57724e0a3ef9d
  1. tests/