[automerger skipped] Merge "Prevent an app to check if the specified VPN app...

[automerger skipped] Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-v2-dev-plus-aosp am: 3f81ed26 -s ours

am skip reason: Merged-In I0013039f58a6f7c5c73b9acc877d70a0126d0ca7 with SHA-1 5d0e1e8b is already in history

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

Change-Id: I0bf32b7d667fe50ae6fa98d3e2eb5bdbdefca7fb