[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: 247fb06baa -s ours am: a208526107 -s ours am: 09d4698630 -s ours
am: 6cd22c31b5 -s ours
am skip reason: subject contains skip directive

Change-Id: I6ebecabf8ef81e3886413d1088f2afb4d11758ca