Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev