Merge "Accept new OEM VPN types in netd." into main am: 293b0894d1 am: d983bc2bd9

Original change: https://android-review.googlesource.com/c/platform/system/netd/+/3543840

Change-Id: I13db9434203e4b6d6d76212ac976f86d886ca62b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 0238d8a260edcb03a88b46b410be60e904e6827f
  1. client/
  2. include/
  3. netutils_wrappers/
  4. server/
  5. tests/
  6. .editorconfig
  7. Android.bp
  8. NOTICE
  9. OWNERS
  10. PREUPLOAD.cfg
  11. TEST_MAPPING