Merge "Annotate setUidFirewallRule with @GuardedBy" am: 7695e38ec7 am: 012b5cf16b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991973

Change-Id: Ifbfe212e18bc5ff4f6afb1142fd4c28992a77cd7