Merge "Replace the usage of UidRange" am: 1241156261 am: 73a03e9ca8

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

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