[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 skip reason: subject contains skip directive

Change-Id: I6424ce379b435423000637241551ef14f46d6ca0