Merge "Ensure CDMA emergency tone/vibration respects ringer mode."
am: 58bf5020c9

Change-Id: Iaa0386324e3301db92f2bf76a755c07c24a36e9a