[automerger skipped] Merge "Annotate setUidFirewallRule with @GuardedBy" am:...

[automerger skipped] Merge "Annotate setUidFirewallRule with @GuardedBy" am: 7695e38e am: 012b5cf1 am: 6d28cc44 -s ours am: b75312a4 -s ours

am skip reason: Merged-In I1f6c3c9e339935c06b3edd5436b2b1a7922a67ed with SHA-1 22fc59ad is already in history

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

Change-Id: I8c52c1f90b3a8241388ccf0aa06c7b135aec32e6