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

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

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