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

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

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