Merge "Merge "Revert "VCN: Require capability matching on test networks for...

Merge "Merge "Revert "VCN: Require capability matching on test networks for CTS"" am: f81ffceb am: 808cf1ec am: b46594cb" into udc-dev am: 7f6c2c8b

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



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