Merge "Add WiFi country code to Thread country code sources" into main am: 85d3a8661b

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

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