Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: ad4335d5c5 -s ours am: 89ef28e265 -s ours am: a28c13df9e -s ours am: c10e37682b -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 affe82b1a8 is in history" into android10-tests-dev