Merge "Mark testFirewallBlocking as ConnectivityModuleTest"