Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for...

Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8a" into nougat-mr1-cts-dev am: ad4335d5 -s ours am: 89ef28e2 -s ours
am: a28c13df -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 affe82b1 is in history

Change-Id: I4b51a0ab8f2f19bcc4e42101be0c50616b3e2b9e