[automerger skipped] Merge "Simplify APIs exposed for time zone lookups" am: 07dcc4bc0f am: a7d5a3220a am: e5c466d3f5
am: 3cf1c83e5d -s ours
am skip reason: change_id I6c8b791524d16223c414612913b22f4d70c27d61 with SHA1 400efa36ef is in history

Change-Id: I21ecc004b820e1b4458a915061dac799e427536b