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

Change-Id: I0ce7cf0e5826e402619cdf185572e8bf89a618d8