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

Change-Id: I0543c551d82002e6fc0a6115e614232062519328