[automerger skipped] Merge "Rename updateFirewallRule to setUidFirewallRule"...

[automerger skipped] Merge "Rename updateFirewallRule to setUidFirewallRule" am: 39ae5bac am: fa604b4f am: cbfdb8fd -s ours am: c740e6c9 -s ours

am skip reason: Merged-In I0b7427521479271b34aed307f17a6e2225fb3076 with SHA-1 c60b36d7 is already in history

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



Change-Id: Ia0d25d46f3a91421af168eb1d3c8cd7ac33254a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>