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

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

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