Merge "Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK" am: 5d84cbd007 am: f699773fbd" into qt-dev-plus-aosp
am: c0e4d7e02b

Change-Id: I6aec94740732e425c34d66e3f65cd75f8298b53d