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

am skip reason: skip tag Change-Id I2550cb3ddd9c72c12de0dbf9baf32eec6fa3b151 with SHA-1 00950274cb is already in history

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

Change-Id: I9e89c1a6e81b97e37254a23a4c4e28356836b77a