[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: af2b3db4ad -s ours
am: 65897ce514

Change-Id: Ic4c70ceb8e092916e3d840b2ffe2f715e40decde