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

Change-Id: I3b08c05df6cb3f4d11349d97495659b01326961c