Merge "Update testFirewallBlocking to check uid chain"