[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am: 4464a8554c am: ed513e7f73 am: df0c7093bb -s ours am: 1ce7660e6f -s ours
am: 965eeb7cb3

Change-Id: I18fb59785061fdfd910907d3e838aa2c25074e99