DO NOT MERGE New Japanese Era implementation with actual Reiwa name (part 2)

This change should have been done as a part of
http://r.android.com/940636 but was accidentally missed
during merging. It includes the following upstream commit:

  8205432: Replace the placeholder Japanese era name
  http://hg.openjdk.java.net/jdk/jdk/rev/3d8934bf505a

Bug: 131312444
Test: cts-tradefed run cts-dev -m CtsLibcoreOjTestCases
Test: cts-tradefed run cts-dev -m CtsLibcoreTestCases
Change-Id: Ie74af5b9cb5559a829cbb671f87fd791d1680d8b
Merged-In: Ie74af5b9cb5559a829cbb671f87fd791d1680d8b
(cherry picked from commit f7e9b4bca83b7d82fdf1c1e794163b4fc9dd4a1e)