Merge "Update sound/vibrate notification key only when it actually buzz/beep." am: 5432355d0c
am: 21d607da99

Change-Id: I6570fea210eb95d1a6dcfeac71c3e4b36390db11