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

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

Change-Id: I56425b4a5ff8a27b719fe8fe0c3a9b37cb83d96d