Merge "Fix validation URL flakes with DeviceConfigRule" am: 39e121cc88 am: 156ddb01a4

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

Change-Id: Iab931b722f836f42fb8f7be1d2463c41aa5608ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>