[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: I0fd0271a022d884bb761e376a0a63b9e84d41799