[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: 92a9ce5ff3 -s ours am: 32ac18cf7a -s ours am: d3ea538265 -s ours am: d4cea1bf4c -s ours
am: 719d3dc3ac

Change-Id: Idee2453077e69231517f47dfd09703317e6fc47a