Merge "VCN: Require capability matching on test networks for CTS" am: 9be9f000

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



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