[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: af2b3db4ad -s ours am: 93bc1a35a2 -s ours am: 0a96c94ea4 -s ours
am: c97f30efc2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1ea076e550e737c179fb09a74019637dea3332b