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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA152b82e3312is in history Change-Id: I3f3279a8747253ac763d0703075485c3153cda86
This commit is contained in: