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

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

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