[automerger skipped] New Japanese Era implementation with actual Reiwa name (part 2)
am: bfb34cd493 -s ours
am skip reason: change_id Ie74af5b9cb5559a829cbb671f87fd791d1680d8b with SHA1 f7e9b4bca8 is in history

Change-Id: I721134d72be205aed14fc67f9b909ea32f41eada