[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30 am: caee99b3cf -s ours am: 5ecbd991d5 -s ours
am:cdef8b40ad-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1de0f268f78is in history Change-Id: I3bd1878cdc5b94797309928d150deb1accb9059c
This commit is contained in: