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