Merge "Using upper case country code" into udc-dev am: 524b15c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663



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