Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours
am:956b28af13-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1d51ae5760dis in history Change-Id: I47ea61fd0bdc9c2b4fe080e29550b5fc0d2c1b38
This commit is contained in: