[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: faa39d2313 -s ours am: b99e927d0a -s ours
am: 9d93edc9f5

Change-Id: I74f2d36859c559d4b5258afc07bfdf2ee0e678b8