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

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

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