Merge "Move fail in testFirewallBlocking" am: e74c7b6936 am: 947cdba89d

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

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