[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: I3a482f4e516c0e9e417537478bc155925f0a0ea6
This commit is contained in: