Merge "Skip cts testFirewallBlocking in instant mode." am: 172fae10d7 am: 62c2b6ad96

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

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