[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: 7ef3464ff9 -s ours am: 0601948bee -s ours
am: 748811f40d -s ours
am skip reason: change_id Iadc96b33bb11c0716fb9fedd158805b32cf1644f with SHA1 e85c43713f is in history

Change-Id: I45ca995e7c92f1223213e7cc0bafcf1c467575da