[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: 98a30a1eec -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Ia82cf1cd36f3f987d9dfd3740dd14ecd37ce1e46
tree: 40f6fd356a5972775ed636aae834e4ba4b9aa59a
  1. tests/