Merge "Rename updateFirewallRule to setUidFirewallRule" am: 39ae5bac21

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

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