[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 58
am: 07cd4ca63c -s ours
am skip reason: subject contains skip directive

Change-Id: I24d905aa7e1d052733fc598d8caa888aa2900431