[automerger skipped] Merge "Api review: change updateFirewallRule to setUidFirewallRule" am: 3d4de57752 am: d3840cee9e am: f25ba31827 -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: I76c007f4881e9d475bea4db30e83c890451da665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>