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

Change-Id: Id858aadd6a62ce4fdc4c77f6ca1fc3649e6c4e41