[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours am: 6591499e44 -s ours am: 2082597684 -s ours
am:8975d1e2d9-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1d51ae5760dis in history Change-Id: Ic0cc3a8523dbe6608d7a2e920110725b62969628
This commit is contained in: