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

Merge "Disconnect VPN when the underlying network is lost" am: f55958fc am: a03e3f9a am: b883281e am: ceecf64c am: 429e5dcc

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



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