Merge "Skip TestDropPacketToVpnAddress if the feature is disabled" into main am: b8950d144a

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

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