Merge "Tidy up libcore.timezone APIs" am: 8e0e0e8535

Change-Id: I0e15ce478bfaffb5defd0cfdb0e414f85bcf7af6