Merge "Add NET_CAPABILITY_NOT_VPN when requesting test network" am: 6ccd0e0503 am: 46d9f02a15 am: a4c15d442d am: bae41b28d5 am: c9574d7c8e am: 483d191f41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062247 Change-Id: I810d04879694f0e6de8a7feb10d2dc4b03848a0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: