[automerger skipped] Replace the placeholder Japanese era name in calendar.properties
am: 17dbda6711 -s ours
am skip reason: change_id If231c253a7797776189fc9e87779a9d674984b55 with SHA1 076d67b4d2 is in history

Change-Id: I938d87c07e87643c6eb7ddff4c163f5a0b13359b