[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6

Change-Id: Ie7fd5c786de0da298e2a2a3dd34ad5d5d4dab98d