[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: 65f8f1dd0f -s ours
am: 78a7c43855 -s ours
am skip reason: subject contains skip directive

Change-Id: I841e961fc4478e909128be19b7dcfc1cc0d249a2