Merge "Exempt adb socket for hostside VpnTest"
am: 1b99a84106

Change-Id: I032a25b809c50f3119ca16d79880b194dee28652