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

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

Change-Id: I56b038c2f8faa54767d18f95cbaa0d343c639fe1