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

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

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