Merge "Revert "VCN: Require capability matching on test networks for CTS"" am: f81ffcebd4 am: 808cf1ecd0

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

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