tree 209ebd076260ec3636d212d0c6c0729865ae0d31
parent 047d1a9ed5cc2601ca688a0646bece33a92e1b83
parent dd32bb52f79369c1c19ace909c7c05fc967580d5
author markchien <markchien@google.com> 1564159847 -0700
committer android-build-merger <android-build-merger@google.com> 1564159847 -0700

Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev
am: 873f2d8aa3

Change-Id: Ic968bb8f93e3471b9b5b47d336752957b23ce16b