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

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

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