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

Change-Id: I1385ab99ce29f75d5692233aa872cd48bce987a1