Merge "Restart Bypassable VPNs when changing lockdown mode state" am: 15e5cec7bc

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

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