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

Change-Id: I3222600a7fa1d37b7d8e16115ec067d415f2bdba