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: 14d6922ffe

Change-Id: I9ff252118527d2aca9a4400280f977f699bfe120