[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e52f -s ours am: 1baa39f7b1 -s ours

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 c1f14634a4 is already in history

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

Change-Id: I169190c331866089d76ba64faebc309dae827239
tree: fb50c4077967c636810f0c043b4c9494b833b93f
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING