Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev