Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours
am:7ff168c7a1-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1d51ae5760dis in history Change-Id: Ibb2e82ee1d02bb22abe5a10b0e48c80bf7f047cf
This commit is contained in: