Merge "[Refactor] Make uid owner match comparison logic into a function" into main am: 3897aaf7e9

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

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