Merge "Genericize NC#hasSameUids" am: a0d5980011 am: 0c479d5f82

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

Change-Id: I023a30bb9f593f150b73423daea4d4d1379b10fa