Merge "Avoid depending on 24-hour settings in SimpleDateFormatTest"