[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: 4d2ccd2afe -s ours am: 1f46df5ded
am: 11fd1a929a

Change-Id: I904a7683ce3c0d3f9ebe04d24ed98ec55af9e7db