Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 714c3b39e5 -s ours
am: ad5f526397 -s ours
am skip reason: subject contains skip directive

Change-Id: I2ee1e5bdf50df89c16b19e8e788439858bf505b9