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

Change-Id: I8c217e1e943253f055264ec89f692968782d2d93