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: I86886953ab47f4d176b11d64a915e637559b3987
tree: 3aeed9b9ca3d0058cd41a127790990fbcd24606d
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING