Merge "Revert "Skip TestDropPacketToVpnAddress if the feature is disabled"" into android15-tests-dev