Merge "Move fail in testFirewallBlocking" am: e74c7b6936

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

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