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

Change-Id: I66609083f2f3768807a762a2f23a1b1826bf706d