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
am: 001e4fac96

Change-Id: I2578ccc06d6af569485d3d2c82b2da6a0b656a7e