Merge "Deprecation of legacy VPN types no longer depends on the Provider Model Flag"