Merge "Don't convert all sounds to vibrations in vibrate mode" into oc-mr1-dev am: 169f367125
am: 1ed40b4296

Change-Id: I4594c684ac9b290f896dc00961bb7e5339e747e8