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

Change-Id: Ib6f00367357df8c2361a4a3ff217aadaa552c4ac