Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK"
am: 5d84cbd007

Change-Id: I671d25b15283a252489286dbb0a9105332d97ce7