Merge "New Japanese Era implementation with actual Reiwa name (part 2)"
am: e2b9fcda58

Change-Id: I052c526b88aa6b25f6d22c60dcabf77439acf134