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

Change-Id: Ie28f5c55fcd5eb7fda00eb4bdf0a7f889ae7bcd9