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

Merge "Restart Bypassable VPNs when changing lockdown mode state" am: 15e5cec7 am: 3a2d2ef7 am: 7582e5ac am: ecb50f8f am: 695477db

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



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