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

Change-Id: I1aaba665e13716082de247fd97e940f569f138a1