Merge "Rewrite UidRanges::overlaps()" am: 13e20ba6e6

Original change: https://android-review.googlesource.com/c/platform/system/netd/+/1764367

Change-Id: I3b4e429fa08d643e28af6edd44bc9bf014fe7670