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 skip reason: subject contains skip directive

Change-Id: I2eb3b27235671ede9889a2f6b87045a78470b717