Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: 6df286c92f -s ours am: 48516f991b -s ours am: f37e3848c2 -s ours
am:627c8a2edb-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1d51ae5760dis in history Change-Id: I73c106f3a65319f3f27052f00bf2d7f473ca423c
This commit is contained in: