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

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

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