Merge "Annotate setUidFirewallRule with @GuardedBy"