Merge changes from topic "vpn-type-oem-enterprise" into main

* changes:
  Treat new OEM VPN types like the corresponding non-OEM types.
  Add more NativeVpnType AIDL constants for OEM-specific VPNs.