Merge changes from topic "vpn-api-fixes" am: 5078c364ba am: e75312253e

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

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