Merge "Ensure CDMA emergency tone/vibration respects ringer mode." into pi-dev