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

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

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