[automerger skipped] Merge "Prevent using commas in url configurations" into rvc-dev am: 6ccbe373 am: 6ca699c2 -s ours

am skip reason: Change-Id I76a847105fc6e57542bb7b8e2dc7ce45ae8393a3 with SHA-1 05137ff6 is in history

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

Change-Id: I2fdf87f851f2e369347d21e449c47223b7cebec8