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: I0485dc0469bde2ee3a06460cf3ea4073f084dd35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>