[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 714c3b39e5 -s ours
am: 78a6f55a1a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5ab8373e556b7ce4aeb69398285c4b2c5b5046c