[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases...
[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645 -s ours
am: 4464a855
Change-Id: I8cb6a133ccbf387424107201c4ccc015d154a881