[automerger skipped] Merge "Rename updateFirewallRule to setUidFirewallRule" am: 39ae5bac21 am: fa604b4fbe am: cbfdb8fd4b -s ours
am skip reason: Merged-In I0b7427521479271b34aed307f17a6e2225fb3076 with SHA-1 c60b36d705 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045073
Change-Id: I643adc1bf2938aec0850221b232fa99f1cd9445a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: