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

Change-Id: Iaa1818e4d04f913c15da06a8dbbc5993d0e0a7e0