Merge "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: ddce521efa -s ours am: 8fe93b6bda -s ours am: f2e8130635 -s ours am: 7526bf0f92 -s ours
am: 781ab3fbdf -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ia4fef6d05a072b94d24e7151f39b68b4f8974d09
tree: f8229f09a6dcfa807dc05fd52e4fbd1951d1dabb
  1. tests/