Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev