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

Change-Id: I9d364730c2b76eb3a9995532585224140c8fa382