[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era
am: af2b3db4ad -s ours
am skip reason: subject contains skip directive

Change-Id: I3ca1b49e04ebb10162a4b99a9b35bebb97f0195c