Merge "Update time_zones_by_country.xml / delete unused files"
am: 143d13ce59

Change-Id: I1a52ac448247c1ebe7dc19f566e87478131a95e0