Merge "Exclude adb socket for AlwaysOnVpn tests" into oreo-mr1-cts-dev
am: 6c2f844112

Change-Id: I118a97b0b89506241044e6e2055cf1874e8e90c2