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

Change-Id: Ic073ca2d5b8e40abd5a1b9eb31082164c9652a9c