[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: c97f30efc2 -s ours am: 701d51de72 -s ours am: 91621e90b4 -s ours
am: c2c3a82c88 -s ours
am skip reason: change_id Iadc96b33bb11c0716fb9fedd158805b32cf1644f with SHA1 e85c43713f is in history

Change-Id: I5ee5f45b7fa6cb7ac30e6f8962b8c4cac6ad4743