Merge "Add check to prevent resetting VPN always-on setting in safe mode" into...

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

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



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