[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: 1ce7660e6f -s ours
am skip reason: subject contains skip directive

Change-Id: Ia8c9d09984cb8fc18c4c01a3f5cc4db35128a2ee