Merge "Tidy up libcore.timezone APIs" am: 45834d96a8 am: 35ffa52384

Change-Id: I87f4ca96ef592c459c96f12906a86889367bfe7e