Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev
am: 77ee4f2ff2

Change-Id: Ib39341f455b82750ef357dbf41d8815fb303844d