Merge "Genericize NC#hasSameUids" am: a0d5980011

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

Change-Id: I22725a20c80bde87716ff5a9d44d76fcd4b95f2b