Merge "Deprecate JapaneseCalendar.CURRENT_ERA"