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

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

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