Merge "Disconnect VPN when the underlying network is lost" am: f55958fc am: a03e3f9a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2222603



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