Merge "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: ddce521efa -s ours am: 8fe93b6bda -s ours am: f2e8130635 -s ours
am:7526bf0f92-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA152b82e3312is in history Change-Id: Ib29a4bbef7c5c4dde43abd0b7ebce12c8aea52a1
This commit is contained in: