[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: 92a9ce5ff3 -s ours am: a14a0a7186
am: 03ed28a5f5

Change-Id: I9281b37605bba16019faf989f8f3a502eba5192a