Merge changes from topic "vpn-api-fixes" am: 5078c364ba am: e75312253e am: 46ebccf52e am: 878fc61979

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

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