Merge "Verify VPN can handle network loss" am: b3cfcc5c18 am: a84634fc2a

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

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