[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: faa39d23 -s ours
am: b99e927d -s ours
am skip reason: subject contains skip directive
Change-Id: I54aeea91f0f68b7f738c6e567fc5212c8f788b28