[automerger skipped] Replace the usage of UidRange am: 2257ecc830 -s ours am: 5e8d1596b6 -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/+/13958466

Change-Id: I056312ed3ec9c22854a09fa2f75cacca19c07e03