Merge "Deprecate JapaneseCalendar.CURRENT_ERA" am: 0f5893ee60
am: 7f9c43a01e

Change-Id: Idb56be376c9b9e14f587ac3078d9356ca661c708