tree e195d42830b3009657543c397a005d0ad6a0a892
parent ea005ea2eedff8b56ae4dd68d820f0e3c2da1099
parent ffaed0bbc0167cbb89250cdbd06d7d7031ee5fd0
author markchien <markchien@google.com> 1566858858 -0700
committer android-build-merger <android-build-merger@google.com> 1566858858 -0700

[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev
am: ffaed0bbc0 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 59c4148eca is in history

Change-Id: Ice656a5071de57fc10f98192ffd11bea2ca4668f