Merge "Add NET_CAPABILITY_NOT_VPN when requesting test network" am: 6ccd0e0503 am: 46d9f02a15

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

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