Merge "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: db05217a3d -s ours
am: a2d046aa11 -s ours
am skip reason: subject contains skip directive

Change-Id: I43b6db32feae4bc3eaeeddb7a2717f2e0f9c5978