Merge "Remove time_zones_by_country.xml file"
am: 3436fd4833

Change-Id: I75cf86290b0dcc5aa99b9d0ebacbc5aa07269aab