Merge "Rename updateFirewallRule to setUidFirewallRule" am: 39ae5bac21 am: fa604b4fbe

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

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