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

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

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