[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours
am: 1cbd924a11 -s ours
am skip reason: subject contains skip directive

Change-Id: Ied44e730d282c34778fdda34d6f213e40b0ef2e4