Merge "Use netd socketDestroy for VPN in T-" am: d8b852fc06 am: fb2ec37ecd am: d54d71ed34

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2614310

Change-Id: I6871fbdee5896c460ba69781140c78541cb8f974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>