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: 28ab1a69

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



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