[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: fc7848ce -s ours am: f25bd692 -s ours

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

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

Change-Id: I56710b6d45821030e6b62eb62285fcbc428fdb9b