[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 58 am: fc5a01ba3d -s ours
am: f04b16ccf8

Change-Id: I896bf8b37d120832521c4db58c131415d6ba75c1