Merge "Revert "Replace the usage of UidRange"" am: 83f77d83fd am: 0f97255402

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

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