[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev
am: ad4335d5c5 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 e59803d27a is in history

Change-Id: I9b3f5d162a2bf1b5e576af496f6b4428b3aaa0f4