[automerger skipped] Merge "Api review: change updateFirewallRule to setUidFirewallRule" am: 3d4de57752 am: ff33b2e819 -s ours

am skip reason: Merged-In I52a02ebe109b687359f579c16fded4af3c9cd242 with SHA-1 4b00f76859 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2045104

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