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

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

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