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