Merge "Api review: change updateFirewallRule to setUidFirewallRule" am: 3d4de57752

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

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