[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: ca8eee2c -s ours am: f23fd01f -s ours am: 92905c46 -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/+/34824370



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