Merge "Restart Bypassable VPNs when changing lockdown mode state" am: 15e5cec7 am: 3a2d2ef7

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



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