[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
am: ed513e7f
Change-Id: I3b08c05df6cb3f4d11349d97495659b01326961c