[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 skipped: f13301b2c5 skipped: f51d69c45f skipped: 891ff66238 skipped skipped: 0bd08adc85

Change-Id: I5e7c110fef97a7f4db6e5ad2210a4a296baea50f