Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am: 1cbd924a11 -s ours am: b6341d3706 -s ours am: 3f87289896 -s ours
am: 216c7745ae

Change-Id: I405fee6107214a4b2c5b66eef16cc90d16735398