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

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

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