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

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

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