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

Change-Id: I14f418a9b09826c58817586f7635277ef6833b90