Merge "Annotate setUidFirewallRule with @GuardedBy" into tm-dev