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

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

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