Merge "[Thread] add country code overlay to enable/disable setting Thread country code" into main am: adb71602c5 am: 6183394f07

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

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