[automerger skipped] Add check to prevent resetting VPN always-on setting in...

[automerger skipped] Add check to prevent resetting VPN always-on setting in safe mode am: 46014fcd am: e36d8a16 am: 82d0c27d -s ours

am skip reason: Merged-In I03399c7c258ce5db67e81b4e51f25f2cb37700c9 with SHA-1 8cd775d4 is already in history

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



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