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: f381b85137 -s ours am: 9ffcfd4428 -s ours
am: 4bfff52f8b

Change-Id: I128d9f7c98c90e43cccbb07f4d0db36cb67efaad