Merge "rename emergency tone settings" am: 2054a4d6d4 am: eb664426c5
am: 648d302ba7

Change-Id: I5edb5cf7b20b022b2a2514ec96bf99e38cf2c007