Merge "rename emergency tone settings"
am: 2054a4d6d4

Change-Id: I106fc98ae0dab79e5e8bc9b5ec10c3810a440aaa