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

Change-Id: I9c4bd1ae9ac8c13732686949ce316c7abf8e5c75