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

Change-Id: I486df8f44bcd67baf933853145f7617cf6b0e891