[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: 247fb06baa -s ours am: a208526107 -s ours am: 09d4698630 -s ours am: 6cd22c31b5 -s ours
am: b50a8e8670 -s ours
am skip reason: change_id Iadc96b33bb11c0716fb9fedd158805b32cf1644f with SHA1 e85c43713f is in history

Change-Id: I32d9c137aa5f63508de3cd2ebcffd8685e3942a4