Merge "ICU4J: Update API for using civil version of IslamicCalendar" into nyc-dev