[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: af2b3db4ad -s ours am: 65897ce514
am: 5962d393fa -s ours
am skip reason: change_id Iadc96b33bb11c0716fb9fedd158805b32cf1644f with SHA1 af2b3db4ad is in history

Change-Id: Ibf8fc41def890eb7c447ea20468722e29c975268