[automerger skipped] Merge "Support seamless handover between VPN fds." am: 9916d4b3e8  -s ours am: f751657ad8  -s ours
am: a3ea288b3c  -s ours

Change-Id: If19c98d0becb9b1e788f6a7196f14211a52d2610