Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am: 1cbd924a11 -s ours
am: b6341d3706 -s ours
am skip reason: subject contains skip directive

Change-Id: Idab3b1926b56988f8d581fa5cbeb2e5e93889a6f