Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: 8e3bef2416 -s ours am skip reason: subject contains skip directive"
tree: a16eee41776247d858eb52db4f37f00c1c81b8d0
  1. tests/