Merge "Conditionally include VCN in Tethering module" into main am: 1f277bbab7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3371183

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