Merge "Set VPN as the preference network for specific apps" am: 593b84759f

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

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