[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: b330fa795e -s ours
am skip reason: subject contains skip directive

Change-Id: I6a83ebd52e56875f3f1ae3b2f4bd7a99bc05356e