Merge changes from topic "vpn-api-fixes" am: 86d9d00a7c am: b8a9c2b121

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

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