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

Change-Id: I2063529ff38235cd2db0d7f1e3ab58339006aaa9