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: e4eaea85b7
am: 349402424f

Change-Id: I9fe9549da2413e09cd0527b931b1cc719cb87c3e