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

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

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