Merge "Genericize NC#hasSameUids" am: a0d5980011 am: f3ff111c93

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

Change-Id: I7953f157a8b0c74190aaeb425123b6f910319e1c