Merge "Genericize NC#hasSameUids" am: a0d5980011

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

Change-Id: I137e91e9edc014fc347fb104d626313e4f609ccd