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

Merge "VCN: Require capability matching on test networks for CTS" am: 9be9f000 am: bc5cc7a8 am: b1080221 am: 2e49589c am: 3695cda3

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



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