Merge "Update setVpnPackageAuthorization call with VPN type"