[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 skip reason: subject contains skip directive

Change-Id: I572f99c9dadc432b15c21da7658fe4d2cc5596b2