Merge "VCN: Allow restricting TRANSPORT_TEST for CTS" am: dee01562d0 am: 80e6084a8d am: 4dd2cc2901

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

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