[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can...
[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: 39b8f78c -s ours am: da7f3544 -s ours
am: 4d2ccd2a -s ours
am skip reason: subject contains skip directive
Change-Id: I0fbecaacd8f93953ecbbfd87648f173549790c71