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

Change-Id: Ieac6b403e5c242f161da56a917e55b07badc888d