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

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

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