[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era am: 92a9ce5ff3 -s ours am: a14a0a7186 am: 03ed28a5f5 am: 8efc4f5848 -s ours am: 50ac01c27f -s ours am: 790dc5904f
am: 1c65e5fe70

Change-Id: I531c1fb0dce15c6ca7ba78f7fe72016fc9ecfb0a