[automerger skipped] Merge "Add check to prevent resetting VPN always-on...

[automerger skipped] Merge "Add check to prevent resetting VPN always-on setting in safe mode" into udc-qpr-dev am: 84a803f7 -s ours

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

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



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