Merge "Update VpnTest to handle teardown-on-network-lost" am: 90798f9a5a

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

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