[automerger skipped] Merge "Support seamless handover between VPN fds." am: 9916d4b3e8 -s ours
am: f751657ad8 -s ours
Change-Id: If474cfa932f6bff8065633a263987f3e28d64890
This commit is contained in: