Merge "Maintain VPN type form the VpnProfile" into sc-dev

                LegacyVpnPreference p = mSettings.findOrCreatePreference(stubProfile, false);

                p.setState(vpn.state);

                p.setAlwaysOn(lockdownVpnKey != null && lockdownVpnKey.equals(vpn.key));

                p.setInsecureVpn(VpnProfile.isLegacyType(stubProfile.type));

                // (b/184921649) do not call setInsecureVpn() for connectedLegacyVpns, since the

                // LegacyVpnInfo does not contain VPN type information, and the profile already

                // exists within vpnProfiles.

                updates.add(p);

            }