[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: 9f64b30d60

Change-Id: Ib59590b6ec8012bd56dc02fd485ffb5a693dd38f