Merge changes from topic "platform-vpn-user-consent"

* changes:
  Update setVpnPackageAuthorization call with VPN type
  Add Platform VPNs to VPN list