Merge "[Reland] VCN: Require capability matching on test networks for CTS" am:...

Merge "[Reland] VCN: Require capability matching on test networks for CTS" am: 47300d9e am: 2216e97b am: 7f2601af am: 0ed03a90 am: ed24c1d4

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



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