Merge "Rename updateFirewallRule to setUidFirewallRule"