Merge "Use .cn URLs for validation on Chinese SIM cards." am: b6329aec62 am: 47ee8bb1fb

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

Change-Id: If4f81b4a91177d4828dc5d815bf8cc0cd31353a7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>