[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e52f -s ours am: 1baa39f7b1 -s ours am: c4d114ad6f -s ours
am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 41918d6cd1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646849
Change-Id: Iae701c502dd7c17b33b8b3efaca38a632a71af0c
This commit is contained in: