Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev