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

Change-Id: I57e04a3201d9203f50e0507e79f01612859850a2