Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev
am: 1d1abc5b0c

* commit '1d1abc5b0ccf31e79aa7173b2e592b7e52b3e519':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.