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

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

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