[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e52f -s ours am: 1baa39f7b1 -s ours am: 3e0e2d99c5 -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: I2faee160c607f6784eb2fc2f951a638c2caecc18
tree: 7046d383091807c6b1f00be517e990d1dc672168
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING