[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 58 am: 07cd4ca63c -s ours am: 33dc1eb961
am: 057adef1be

Change-Id: I4c8eebd11574f3f475f17f26da12055120b91635