Merge "Use ICU Localization for country names in settings."
am: 1cefb73fd6

Change-Id: I2f3f679a109befc6b8d673c822a4fb9b10f0334f