Merge "Stop skipping VPN tests when running ADB over TCP." am: b031a2265e am: 8edbc35d56 am: dee59c5fa4

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

Change-Id: Iaa43013f17c2ffded26527149721b1e60ca3ca88