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
am: 2e1bc53d95

Change-Id: I321c04f636e824291e2496377aec8d4e3e324b0c