Merge "Add check to prevent resetting VPN always-on setting in safe mode" into main am: d5c28dd7

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



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