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

Merge "Revert "VCN: Require capability matching on test networks for CTS"" am: f81ffceb am: 808cf1ec am: b46594cb

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



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