[automerger skipped] Merge "API for retrieving time zone IDs by country" am: 4492ec573a am: b5ab9c2e1f
am: f35dd4fa6c  -s ours

Change-Id: If64bc544d2ffcf2c2a5fb41dcc02a47c980c1bec