[automerger skipped] Replace the usage of UidRange am: b439ce8bda -s ours

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 41918d6cd1 is already in history

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

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