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

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

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