Merge "Verify VPN can handle network loss" am: b3cfcc5c18 am: c91087744c am: df3a655f32 am: ab9078afcc am: cb923bdd7e

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

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