[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 tm-qpr-dev am: 56d05104 -s ours am: 09b2101d -s ours am: 8ba68be6 -s ours am: 9b9bb3a2 -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: If8587417146c6376f745b969589413df40847e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>