tree 008d02ec74686f102bdd69d5d4bf78075d8895a7
parent 97a50a1348d93fbbfae2aeb31397f2467de8a51e
parent b84038696c7684dd8905e58be1f2430eb689701e
author Brio Automation <brio.automation@gmail.com> 1553647702 -0700
committer android-build-merger <android-build-merger@google.com> 1553647702 -0700

[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