Merge "Add NET_CAPABILITY_NOT_VPN when requesting test network"