Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 7ff168c7a1 -s ours am: 07e500dd00 -s ours am: 10d149e4bc -s ours am: 0cb9eae765 -s ours
am:9f4a5995a2-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA152b82e3312is in history Change-Id: Ifb330f4bcfb612767c9e92a5b439522a8461d50b
This commit is contained in: