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 am: 3eb933d2

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



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