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

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

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