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

Change-Id: Ia40b6889f65d8a49a350e434c6d003cbc3eab340