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

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

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