Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."