[automerger skipped] Merge "Add test to verify make urls configuration" into...

[automerger skipped] Merge "Add test to verify make urls configuration" into rvc-dev am: 858f64b4 am: bbb9ea20 am: d9a83a6e -s ours

am skip reason: Change-Id Ib9c25b43a52963e4222de8152c47c9eb26227e65 with SHA-1 91f0b5b4 is in history

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

Change-Id: I298dc2f846c515f0bf09d763ee55a4f00c56978e