Merge "remove unused combineUidTag()" am: 8154deb5d6 am: 47d83bdf58

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

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