[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: 1f46df5d
Change-Id: I65f49bb9ce5f52af383e7e75fc728bf9bd81a3fe