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

Change-Id: Ia932fcc54291a6e91bb3f2ca754fd53b0d880dac