[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-dev am: 34137fbb am: 4718cfc8 am: 860a03cf -s ours am: 4713bc76 -s ours

am skip reason: Merged-In I0013039f58a6f7c5c73b9acc877d70a0126d0ca7 with SHA-1 46eb3bea is already in history

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

Change-Id: I7d298d3c11688b351b2db41665143b4b254c6586