[automerger skipped] Remove UdpEncapsulationSocket references in VPNs am:...
[automerger skipped] Remove UdpEncapsulationSocket references in VPNs am: 8b555224 am: 272225d6 -s ours
am skip reason: Change-Id I69f184762490b1dd3d3261d00c81fd32bbebddfc with SHA-1 2796cff6 is in history
Change-Id: I442479650e48e9cea978f6d617017bafaf19cbfd