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

Change-Id: I004a9d2c26261247265a4758f1811969b5f825ec