Merge "Deprecate JapaneseCalendar.CURRENT_ERA"
am: 0f5893ee60

Change-Id: I29548ec04dd5a37d5a672430002b380ff56667d9