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

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

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