[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 skip reason: subject contains skip directive
Change-Id: I182c1f276fbc58eb22723ae7c2ac559c35824aa2